(Fcall_interactively): Revert 2008-03-16 change

for interactive code letters 'b' and 'B'.

diff --git a/src/ChangeLog b/src/ChangeLog
index c7f52c3dd6a59e017e70174e0438fc5c6994794c..844f42e7301db20e6fdf7034f4a748f8cb6aa998 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-29  Juri Linkov  <juri@jurta.org>
+
+       * callint.c (Fcall_interactively): Revert 2008-03-16 change
+       for interactive code letters 'b' and 'B'.
+
 2008-03-29  Eli Zaretskii  <eliz@gnu.org>
 
        * fileio.c (Fexpand_file_name): Convert the value of $HOME to a

diff --git a/src/callint.c b/src/callint.c
index 2f98d263410aa7c94e82377af44d457e180359f0..8a9f8322d9b889828581598c773c27148f2bd5a2 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -513,35 +513,16 @@ invoke it.  If KEYS is omitted or nil, the return value of
          break;
 
        case 'b':               /* Name of existing buffer */
+         args[i] = Fcurrent_buffer ();
+         if (EQ (selected_window, minibuf_window))
+           args[i] = Fother_buffer (args[i], Qnil, Qnil);
+         args[i] = Fread_buffer (callint_message, args[i], Qt);
+         break;
+
        case 'B':               /* Name of buffer, possibly nonexistent */
-         {
-           Lisp_Object tema, temb, temc;
-
-           /* 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 (EQ (temb, temc))
-                 continue;
-               if (NILP (temb))
-                 continue;
-               if (NILP (XBUFFER (temb)->name))
-                 continue;
-               if (SREF (XBUFFER (temb)->name, 0) == ' ')
-                 continue;
-               tema = Fcons (XBUFFER (temb)->name, tema);
-             }
-           args[i] = Fread_buffer (callint_message, Fnreverse (tema),
-                                   *tem == 'b' ? Qt : Qnil);
-         }
+         args[i] = Fread_buffer (callint_message,
+                                 Fother_buffer (Fcurrent_buffer (), Qnil, Qnil),
+                                 Qnil);
          break;
 
         case 'c':              /* Character */