comparison src/callint.c @ 93400:82e99a4c7c09

(Fcall_interactively): Revert 2008-03-16 change for interactive code letters 'b' and 'B'.
author Juri Linkov <juri@jurta.org>
date Sat, 29 Mar 2008 22:58:17 +0000
parents 7316c5c792f4
children 5dd7fdf8c27e
comparison
equal deleted inserted replaced
93399:31570cd2d566 93400:82e99a4c7c09
511 teml = visargs[i]; 511 teml = visargs[i];
512 args[i] = Fintern (teml, Qnil); 512 args[i] = Fintern (teml, Qnil);
513 break; 513 break;
514 514
515 case 'b': /* Name of existing buffer */ 515 case 'b': /* Name of existing buffer */
516 args[i] = Fcurrent_buffer ();
517 if (EQ (selected_window, minibuf_window))
518 args[i] = Fother_buffer (args[i], Qnil, Qnil);
519 args[i] = Fread_buffer (callint_message, args[i], Qt);
520 break;
521
516 case 'B': /* Name of buffer, possibly nonexistent */ 522 case 'B': /* Name of buffer, possibly nonexistent */
517 { 523 args[i] = Fread_buffer (callint_message,
518 Lisp_Object tema, temb, temc; 524 Fother_buffer (Fcurrent_buffer (), Qnil, Qnil),
519 525 Qnil);
520 /* Get a list of buffer names (except internal buffers), and
521 use this list for default values. Put either current
522 buffer or other-buffer in front. */
523 tema = Qnil;
524 temc = Fcurrent_buffer ();
525 if (*tem == 'B' || EQ (selected_window, minibuf_window))
526 temc = Fother_buffer (temc, Qnil, Qnil);
527 tema = Fcons (XBUFFER (temc)->name, tema);
528 teml = Fbuffer_list (selected_frame);
529 for (; CONSP (teml); teml = XCDR (teml))
530 {
531 temb = XCAR (teml);
532 if (EQ (temb, temc))
533 continue;
534 if (NILP (temb))
535 continue;
536 if (NILP (XBUFFER (temb)->name))
537 continue;
538 if (SREF (XBUFFER (temb)->name, 0) == ' ')
539 continue;
540 tema = Fcons (XBUFFER (temb)->name, tema);
541 }
542 args[i] = Fread_buffer (callint_message, Fnreverse (tema),
543 *tem == 'b' ? Qt : Qnil);
544 }
545 break; 526 break;
546 527
547 case 'c': /* Character */ 528 case 'c': /* Character */
548 args[i] = Fread_char (callint_message, Qnil, Qnil); 529 args[i] = Fread_char (callint_message, Qnil, Qnil);
549 message1_nolog ((char *) 0); 530 message1_nolog ((char *) 0);