diff --git a/src/buffer.c b/src/buffer.c
index d190bdf..f7ff01f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3087,11 +3087,12 @@
 	qsort(buflist.ga_data, (size_t)buflist.ga_len,
 		sizeof(buf_T *), buf_compare);
 
-	p = buflist_data = (buf_T **)buflist.ga_data;
-	buf = *p;
+	buflist_data = (buf_T **)buflist.ga_data;
+	buf = *buflist_data;
     }
+    p = buflist_data;
 
-    for (; buf != NULL && !got_int; buf = buflist_data
+    for (; buf != NULL && !got_int; buf = buflist_data != NULL
 	    ? (++p < buflist_data + buflist.ga_len ? *p : NULL)
 	    : buf->b_next)
 #else
diff --git a/src/version.c b/src/version.c
index 9bb1436..3cc9879 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2267,
+/**/
     2266,
 /**/
     2265,