(pop_message_unwind): Renamed from push_message_unwind.

diff --git a/src/lisp.h b/src/lisp.h
index b1574c3415a2d5d418cb89655fffa7e6d1afe7ef..f0ae25fc78aea4bbd9d3574ba41ca1ba9e8470ca 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2369,7 +2369,8 @@ extern Lisp_Object echo_area_buffer[2];
 extern void check_message_stack P_ ((void));
 extern void setup_echo_area_for_printing P_ ((int));
 extern int push_message P_ ((void));
-extern Lisp_Object push_message_unwind P_ ((Lisp_Object));
+extern Lisp_Object pop_message_unwind P_ ((Lisp_Object));
+extern Lisp_Object restore_message_unwind P_ ((Lisp_Object));
 extern void pop_message P_ ((void));
 extern void restore_message P_ ((void));
 extern Lisp_Object current_message P_ ((void));

diff --git a/src/xdisp.c b/src/xdisp.c
index b6fe751237fe60bb7c952fabca975c5d0a47a68a..d6f26cbf8c8fd16148e70489d1ca889130a374b1 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6842,17 +6842,6 @@ push_message ()
 }
 
 
-/* Handler for record_unwind_protect calling pop_message.  */
-
-Lisp_Object
-push_message_unwind (dummy)
-     Lisp_Object dummy;
-{
-  pop_message ();
-  return Qnil;
-}
-
-
 /* Restore message display from the top of Vmessage_stack.  */
 
 void
@@ -6869,6 +6858,16 @@ restore_message ()
 }
 
 
+/* Handler for record_unwind_protect calling pop_message.  */
+
+Lisp_Object
+pop_message_unwind (dummy)
+     Lisp_Object dummy;
+{
+  pop_message ();
+  return Qnil;
+}
+
 /* Pop the top-most entry off Vmessage_stack.  */
 
 void