aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2002-09-11 01:59:33 +0000
committerRichard M. Stallman2002-09-11 01:59:33 +0000
commit37d66095580c7ead78a88b6d1ac46edfdb94d5c4 (patch)
tree740765850ab0a76e841dd1be0d4fd8b4b534b910 /src
parent65efd7daf6a5ee431a1d883750cbaaa26e2ee818 (diff)
downloademacs-37d66095580c7ead78a88b6d1ac46edfdb94d5c4.tar.gz
emacs-37d66095580c7ead78a88b6d1ac46edfdb94d5c4.zip
(pop_message_unwind): Renamed from push_message_unwind.
Diffstat (limited to 'src')
-rw-r--r--src/lisp.h3
-rw-r--r--src/xdisp.c21
2 files changed, 12 insertions, 12 deletions
diff --git a/src/lisp.h b/src/lisp.h
index b1574c3415a..f0ae25fc78a 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2369,7 +2369,8 @@ extern Lisp_Object echo_area_buffer[2];
2369extern void check_message_stack P_ ((void)); 2369extern void check_message_stack P_ ((void));
2370extern void setup_echo_area_for_printing P_ ((int)); 2370extern void setup_echo_area_for_printing P_ ((int));
2371extern int push_message P_ ((void)); 2371extern int push_message P_ ((void));
2372extern Lisp_Object push_message_unwind P_ ((Lisp_Object)); 2372extern Lisp_Object pop_message_unwind P_ ((Lisp_Object));
2373extern Lisp_Object restore_message_unwind P_ ((Lisp_Object));
2373extern void pop_message P_ ((void)); 2374extern void pop_message P_ ((void));
2374extern void restore_message P_ ((void)); 2375extern void restore_message P_ ((void));
2375extern Lisp_Object current_message P_ ((void)); 2376extern Lisp_Object current_message P_ ((void));
diff --git a/src/xdisp.c b/src/xdisp.c
index b6fe751237f..d6f26cbf8c8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6842,17 +6842,6 @@ push_message ()
6842} 6842}
6843 6843
6844 6844
6845/* Handler for record_unwind_protect calling pop_message. */
6846
6847Lisp_Object
6848push_message_unwind (dummy)
6849 Lisp_Object dummy;
6850{
6851 pop_message ();
6852 return Qnil;
6853}
6854
6855
6856/* Restore message display from the top of Vmessage_stack. */ 6845/* Restore message display from the top of Vmessage_stack. */
6857 6846
6858void 6847void
@@ -6869,6 +6858,16 @@ restore_message ()
6869} 6858}
6870 6859
6871 6860
6861/* Handler for record_unwind_protect calling pop_message. */
6862
6863Lisp_Object
6864pop_message_unwind (dummy)
6865 Lisp_Object dummy;
6866{
6867 pop_message ();
6868 return Qnil;
6869}
6870
6872/* Pop the top-most entry off Vmessage_stack. */ 6871/* Pop the top-most entry off Vmessage_stack. */
6873 6872
6874void 6873void