[Emacs-diffs] Changes to emacs/src/callint.c,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/03/20 17:21:18

Index: callint.c
===================================================================
RCS file: /sources/emacs/emacs/src/callint.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- callint.c   16 Mar 2008 17:45:52 -0000      1.162
+++ callint.c   20 Mar 2008 17:21:16 -0000      1.163
@@ -516,20 +516,20 @@
        case 'B':               /* Name of buffer, possibly nonexistent */
          {
            Lisp_Object tema, temb, temc;
-           int skip_current = 1;
 
-           if (*tem == 'b' && !EQ (selected_window, minibuf_window))
-             skip_current = 0;
-
-           /* Get a list of buffer names (except the current buffer and
-              internal buffers), and use this list for default values.  */
+           /* Get a list of buffer names (except internal buffers), and
+              use this list for default values.  Put either current
+              buffer or other-buffer in front.  */
            tema = Qnil;
            temc = Fcurrent_buffer ();
+           if (*tem == 'B' || EQ (selected_window, minibuf_window))
+             temc = Fother_buffer (temc, Qnil, Qnil);
+           tema = Fcons (XBUFFER (temc)->name, tema);
            teml = Fbuffer_list (selected_frame);
            for (; CONSP (teml); teml = XCDR (teml))
              {
                temb = XCAR (teml);
-               if (skip_current && EQ (temb, temc))
+               if (EQ (temb, temc))
                  continue;
                if (NILP (temb))
                  continue;