From: Kim F. Storm <storm@cua.dk>
Date: Fri, 3 Jun 2005 23:02:21 +0000 (+0000)
Subject: (unbind_to): Preserve value of Vquit_flag.
X-Git-Tag: emacs-pretest-22.0.90~9343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a073f50755944ae51a08f670d8acf192d69e036;p=emacs.git

(unbind_to): Preserve value of Vquit_flag.
---

diff --git a/src/eval.c b/src/eval.c
index 8bb201c5df5..0eb1482ee0b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3130,10 +3130,10 @@ unbind_to (count, value)
      int count;
      Lisp_Object value;
 {
-  int quitf = !NILP (Vquit_flag);
-  struct gcpro gcpro1;
+  Lisp_Object quitf = Vquit_flag;
+  struct gcpro gcpro1, gcpro2;
 
-  GCPRO1 (value);
+  GCPRO2 (value, quitf);
   Vquit_flag = Qnil;
 
   while (specpdl_ptr != specpdl + count)
@@ -3182,8 +3182,8 @@ unbind_to (count, value)
 	}
     }
 
-  if (NILP (Vquit_flag) && quitf)
-    Vquit_flag = Qt;
+  if (NILP (Vquit_flag) && !NILP (quitf))
+    Vquit_flag = quitf;
 
   UNGCPRO;
   return value;