showmarks.patch

diff --git a/basic.c b/basic.c
index 8c687aa..3ca56b8 100644
--- a/basic.c
+++ b/basic.c
@@ -1449,7 +1449,13 @@ makemarkslist(int value GCC_UNUSED, void *dummy GCC_UNUSED)
 int
 showmarks(int f, int n GCC_UNUSED)
 {
-    return liststuff(MARKS_BufName, FALSE, makemarkslist, f, (void *) curbp);
+    WINDOW *wp = curwp;
+    int s = liststuff(MARKS_BufName, FALSE, makemarkslist, f, (void *) curbp);
+    /* back to the buffer whose marks we just listed */
+    if (swbuffer(wp->w_bufp)) {
+      curwp = wp;
+    }
+    return s;
 }
 
 #if OPT_UPBUFF