[Emacs-diffs] Changes to emacs/src/eval.c

[Kim F . Storm]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.239 emacs/src/eval.c:1.240
*** emacs/src/eval.c:1.239      Thu May 26 09:32:15 2005
--- emacs/src/eval.c    Fri Jun  3 23:02:21 2005
***************
*** 3130,3139 ****
       int count;
       Lisp_Object value;
  {
!   int quitf = !NILP (Vquit_flag);
!   struct gcpro gcpro1;
  
!   GCPRO1 (value);
    Vquit_flag = Qnil;
  
    while (specpdl_ptr != specpdl + count)
--- 3130,3139 ----
       int count;
       Lisp_Object value;
  {
!   Lisp_Object quitf = Vquit_flag;
!   struct gcpro gcpro1, gcpro2;
  
!   GCPRO2 (value, quitf);
    Vquit_flag = Qnil;
  
    while (specpdl_ptr != specpdl + count)
***************
*** 3182,3189 ****
        }
      }
  
!   if (NILP (Vquit_flag) && quitf)
!     Vquit_flag = Qt;
  
    UNGCPRO;
    return value;
--- 3182,3189 ----
        }
      }
  
!   if (NILP (Vquit_flag) && !NILP (quitf))
!     Vquit_flag = quitf;
  
    UNGCPRO;
    return value;