diff options
| author | Kim F. Storm | 2005-06-03 23:02:21 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-06-03 23:02:21 +0000 |
| commit | 5a073f50755944ae51a08f670d8acf192d69e036 (patch) | |
| tree | 3055e6e3d0f6ab8d40e5f9385e3482ba76f6a8fc /src | |
| parent | 24aad44185871b6e1cd36265b10639bed9b97f1a (diff) | |
| download | emacs-5a073f50755944ae51a08f670d8acf192d69e036.tar.gz emacs-5a073f50755944ae51a08f670d8acf192d69e036.zip | |
(unbind_to): Preserve value of Vquit_flag.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |||
| 3130 | int count; | 3130 | int count; |
| 3131 | Lisp_Object value; | 3131 | Lisp_Object value; |
| 3132 | { | 3132 | { |
| 3133 | int quitf = !NILP (Vquit_flag); | 3133 | Lisp_Object quitf = Vquit_flag; |
| 3134 | struct gcpro gcpro1; | 3134 | struct gcpro gcpro1, gcpro2; |
| 3135 | 3135 | ||
| 3136 | GCPRO1 (value); | 3136 | GCPRO2 (value, quitf); |
| 3137 | Vquit_flag = Qnil; | 3137 | Vquit_flag = Qnil; |
| 3138 | 3138 | ||
| 3139 | while (specpdl_ptr != specpdl + count) | 3139 | while (specpdl_ptr != specpdl + count) |
| @@ -3182,8 +3182,8 @@ unbind_to (count, value) | |||
| 3182 | } | 3182 | } |
| 3183 | } | 3183 | } |
| 3184 | 3184 | ||
| 3185 | if (NILP (Vquit_flag) && quitf) | 3185 | if (NILP (Vquit_flag) && !NILP (quitf)) |
| 3186 | Vquit_flag = Qt; | 3186 | Vquit_flag = quitf; |
| 3187 | 3187 | ||
| 3188 | UNGCPRO; | 3188 | UNGCPRO; |
| 3189 | return value; | 3189 | return value; |