Merge pull request #1754 from justinmk/vim-7.4.487

vim-patch:7.4.487 vim-patch:6a598be

2 files changed, 15 insertions, 14 deletions

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4d0e950b24..f0f1db506d 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -251,7 +251,7 @@ static int included_patches[] = {
   //490,
   489,
   488,
-  //487,
+  487,
   486,
   485,
   //484 NA
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 1a102cf069..ed4a8d8e7a 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -3543,27 +3543,28 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, int tri
 }
 
 
-/*
- * Jump to the first open window that contains buffer "buf", if one exists.
- * Returns a pointer to the window found, otherwise NULL.
- */
+/// Jump to the first open window that contains buffer "buf", if one exists.
+/// Returns a pointer to the window found, otherwise NULL.
 win_T *buf_jump_open_win(buf_T *buf)
 {
-  FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
-    if (wp->w_buffer == buf) {
-      win_enter(wp, false);
-      return wp;
+  if (curwin->w_buffer == buf) {
+    win_enter(curwin, false);
+    return curwin;
+  } else {
+    FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
+      if (wp->w_buffer == buf) {
+        win_enter(wp, false);
+        return wp;
+      }
     }
   }
 
   return NULL;
 }
 
-/*
- * Jump to the first open window in any tab page that contains buffer "buf",
- * if one exists.
- * Returns a pointer to the window found, otherwise NULL.
- */
+/// Jump to the first open window in any tab page that contains buffer "buf",
+/// if one exists.
+/// @return the found window, or NULL.
 win_T *buf_jump_open_tab(buf_T *buf)
 {