Mercurial > emacs
comparison src/minibuf.c @ 46293:1fb8f75062c6
Use macro SPECPDL_INDEX.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 11 Jul 2002 14:18:02 +0000 |
parents | 3f111801efb4 |
children | 40db0673e6f0 |
comparison
equal
deleted
inserted
replaced
46292:712d0161e499 | 46293:1fb8f75062c6 |
---|---|
407 Lisp_Object defalt; | 407 Lisp_Object defalt; |
408 int allow_props; | 408 int allow_props; |
409 int inherit_input_method; | 409 int inherit_input_method; |
410 { | 410 { |
411 Lisp_Object val; | 411 Lisp_Object val; |
412 int count = specpdl_ptr - specpdl; | 412 int count = SPECPDL_INDEX (); |
413 Lisp_Object mini_frame, ambient_dir, minibuffer, input_method; | 413 Lisp_Object mini_frame, ambient_dir, minibuffer, input_method; |
414 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; | 414 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
415 Lisp_Object enable_multibyte; | 415 Lisp_Object enable_multibyte; |
416 extern Lisp_Object Qfront_sticky; | 416 extern Lisp_Object Qfront_sticky; |
417 extern Lisp_Object Qrear_nonsticky; | 417 extern Lisp_Object Qrear_nonsticky; |
730 | 730 |
731 XSETCAR (tail, buf); | 731 XSETCAR (tail, buf); |
732 } | 732 } |
733 else | 733 else |
734 { | 734 { |
735 int count = specpdl_ptr - specpdl; | 735 int count = SPECPDL_INDEX (); |
736 | 736 |
737 reset_buffer (XBUFFER (buf)); | 737 reset_buffer (XBUFFER (buf)); |
738 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); | 738 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
739 Fset_buffer (buf); | 739 Fset_buffer (buf); |
740 Fkill_all_local_variables (); | 740 Fkill_all_local_variables (); |
791 #endif | 791 #endif |
792 minibuf_save_list = Fcdr (minibuf_save_list); | 792 minibuf_save_list = Fcdr (minibuf_save_list); |
793 | 793 |
794 /* Erase the minibuffer we were using at this level. */ | 794 /* Erase the minibuffer we were using at this level. */ |
795 { | 795 { |
796 int count = specpdl_ptr - specpdl; | 796 int count = SPECPDL_INDEX (); |
797 /* Prevent error in erase-buffer. */ | 797 /* Prevent error in erase-buffer. */ |
798 specbind (Qinhibit_read_only, Qt); | 798 specbind (Qinhibit_read_only, Qt); |
799 specbind (Qinhibit_modification_hooks, Qt); | 799 specbind (Qinhibit_modification_hooks, Qt); |
800 old_deactivate_mark = Vdeactivate_mark; | 800 old_deactivate_mark = Vdeactivate_mark; |
801 Ferase_buffer (); | 801 Ferase_buffer (); |
1526 Lisp_Object hist, def, inherit_input_method; | 1526 Lisp_Object hist, def, inherit_input_method; |
1527 { | 1527 { |
1528 Lisp_Object val, histvar, histpos, position; | 1528 Lisp_Object val, histvar, histpos, position; |
1529 Lisp_Object init; | 1529 Lisp_Object init; |
1530 int pos = 0; | 1530 int pos = 0; |
1531 int count = specpdl_ptr - specpdl; | 1531 int count = SPECPDL_INDEX (); |
1532 struct gcpro gcpro1; | 1532 struct gcpro gcpro1; |
1533 | 1533 |
1534 init = initial_input; | 1534 init = initial_input; |
1535 GCPRO1 (def); | 1535 GCPRO1 (def); |
1536 | 1536 |