diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2006-02-26 16:14:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2006-02-26 16:14:20 +0000 |
| commit | a7af5886205c9ba974ccff9ee4bcc7ea80a46429 (patch) | |
| tree | 40e83930b9a341d95e6c9f9f0f2d009dc759a9a8 | |
| parent | 782ea71aba3761983d71bf8ab9bb77c974abab56 (diff) | |
| download | emacs-a7af5886205c9ba974ccff9ee4bcc7ea80a46429.tar.gz emacs-a7af5886205c9ba974ccff9ee4bcc7ea80a46429.tar.bz2 emacs-a7af5886205c9ba974ccff9ee4bcc7ea80a46429.zip | |
(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.
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/lisp.h | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ea5f5e317b8..bfbbf90e02b 100644 --- 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 992c05251b8..80503c4ccbc 100644 --- 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; |