aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorKarl Heuer1996-01-04 23:01:45 +0000
committerKarl Heuer1996-01-04 23:01:45 +0000
commit690337b7e87d83f0e53cea023c071fb5af4cf145 (patch)
tree3e1f3c3b74bfef24ee71cbbb607802baf341630b /src/eval.c
parentb75dac61a143a61fe7f7759a010e7a90891d784a (diff)
downloademacs-690337b7e87d83f0e53cea023c071fb5af4cf145.tar.gz
emacs-690337b7e87d83f0e53cea023c071fb5af4cf145.zip
(syms_of_eval): Doc fix for inhibit-quit.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c
index cb107191244..5dbc7e8f375 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1208,8 +1208,8 @@ See also the function `condition-case'.")
1208#else 1208#else
1209 if (EQ (clause, Qlambda)) 1209 if (EQ (clause, Qlambda))
1210 { 1210 {
1211 /* We can't return values to code which signalled an error, but we 1211 /* We can't return values to code which signaled an error, but we
1212 can continue code which has signalled a quit. */ 1212 can continue code which has signaled a quit. */
1213 if (EQ (error_symbol, Qquit)) 1213 if (EQ (error_symbol, Qquit))
1214 return Qnil; 1214 return Qnil;
1215 else 1215 else
@@ -2813,7 +2813,7 @@ Typing C-g sets `quit-flag' non-nil, regardless of `inhibit-quit'.");
2813 DEFVAR_LISP ("inhibit-quit", &Vinhibit_quit, 2813 DEFVAR_LISP ("inhibit-quit", &Vinhibit_quit,
2814 "Non-nil inhibits C-g quitting from happening immediately.\n\ 2814 "Non-nil inhibits C-g quitting from happening immediately.\n\
2815Note that `quit-flag' will still be set by typing C-g,\n\ 2815Note that `quit-flag' will still be set by typing C-g,\n\
2816so a quit will be signalled as soon as `inhibit-quit' is nil.\n\ 2816so a quit will be signaled as soon as `inhibit-quit' is nil.\n\
2817To prevent this happening, set `quit-flag' to nil\n\ 2817To prevent this happening, set `quit-flag' to nil\n\
2818before making `inhibit-quit' nil."); 2818before making `inhibit-quit' nil.");
2819 Vinhibit_quit = Qnil; 2819 Vinhibit_quit = Qnil;