(struct specbinding, specpdl_ptr): Remove the volatile qualifier which was

trying to avoid the bug that was fixed by yesterday's changes to xterm.c.

diff --git a/src/ChangeLog b/src/ChangeLog
index ea5f5e317b8d1e79b69a520d89a4cd87665cc122..bfbbf90e02bb99fb7c453f3415ce09c67118aadf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,14 @@
+2006-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * lisp.h (struct specbinding, specpdl_ptr): Remove the volatile
+       qualifier which was trying to avoid the bug that was fixed by
+       yesterday's changes to xterm.c.
+
 2006-02-25  Chong Yidong  <cyd@stupidchicken.com>
 
        * xterm.h (x_catch_errors) Return value changed to void.
-       (x_uncatch_errors): Unused count argument deleted.
-       
+       (x_uncatch_errors): Delete unused count argument delete.
+
        * xterm.c (x_catch_errors): Don't use record_unwind_protect, since
        it can be called in a signal handler.
        (x_catch_errors_unwind): Function deleted.

diff --git a/src/lisp.h b/src/lisp.h
index 992c05251b8a39f6b0ba70059514dab35cdb04c9..80503c4ccbc8a512bfa5ed0fe62b07ecbf90fa9b 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1744,13 +1744,13 @@ typedef Lisp_Object (*specbinding_func) P_ ((Lisp_Object));
 
 struct specbinding
   {
-    volatile Lisp_Object symbol, old_value;
-    volatile specbinding_func func;
+    Lisp_Object symbol, old_value;
+    specbinding_func func;
     Lisp_Object unused;                /* Dividing by 16 is faster than by 12 */
   };
 
 extern struct specbinding *specpdl;
-extern volatile struct specbinding *specpdl_ptr;
+extern struct specbinding *specpdl_ptr;
 extern int specpdl_size;
 
 extern EMACS_INT max_specpdl_size;