Merge pull request #3903 from justinmk/vim-7.4.605

vim-patch:7.4.605

1 files changed, 16 insertions, 17 deletions

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 762cd3efd3..a6e3fedd3f 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -918,13 +918,15 @@ do_buffer (
 
   if (buf == NULL) {        /* could not find it */
     if (start == DOBUF_FIRST) {
-      /* don't warn when deleting */
-      if (!unload)
-        EMSGN(_("E86: Buffer %" PRId64 " does not exist"), count);
-    } else if (dir == FORWARD)
+      // don't warn when deleting
+      if (!unload) {
+        EMSGN(_(e_nobufnr), count);
+      }
+    } else if (dir == FORWARD) {
       EMSG(_("E87: Cannot go beyond last buffer"));
-    else
+    } else {
       EMSG(_("E88: Cannot go before first buffer"));
+    }
     return FAIL;
   }
 
@@ -1711,18 +1713,15 @@ static buf_T *buflist_findname_file_id(char_u *ffname, FileID *file_id,
   return NULL;
 }
 
-/*
- * Find file in buffer list by a regexp pattern.
- * Return fnum of the found buffer.
- * Return < 0 for error.
- */
-int 
-buflist_findpat (
-    char_u *pattern,
-    char_u *pattern_end,       /* pointer to first char after pattern */
-    int unlisted,                   /* find unlisted buffers */
-    int diffmode,             /* find diff-mode buffers only */
-    int curtab_only                /* find buffers in current tab only */
+/// Find file in buffer list by a regexp pattern.
+/// Return fnum of the found buffer.
+/// Return < 0 for error.
+int buflist_findpat(
+    const char_u *pattern,
+    const char_u *pattern_end,  // pointer to first char after pattern
+    int unlisted,               // find unlisted buffers
+    int diffmode,               // find diff-mode buffers only
+    int curtab_only             // find buffers in current tab only
 )
 {
   int match = -1;