Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-120
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-121
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-122
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-123
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-124
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-125
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-126
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-127
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-40
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-41
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-42
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-523

1 files changed, 3 insertions, 1 deletions

diff --git a/src/eval.c b/src/eval.c
index eff284820f0..a84948981f4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -117,7 +117,7 @@ struct specbinding *specpdl;
 
 /* Pointer to first unused element in specpdl.  */
 
-volatile struct specbinding *specpdl_ptr;
+struct specbinding *specpdl_ptr;
 
 /* Maximum size allowed for specpdl allocation */
 
@@ -3199,6 +3199,8 @@ record_unwind_protect (function, arg)
      Lisp_Object (*function) P_ ((Lisp_Object));
      Lisp_Object arg;
 {
+  eassert (!handling_signal);
+
   if (specpdl_ptr == specpdl + specpdl_size)
     grow_specpdl ();
   specpdl_ptr->func = function;