diff options
| author | Richard M. Stallman | 2007-07-15 18:58:25 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2007-07-15 18:58:25 +0000 |
| commit | ec07b64b8eef75156015cbea689919c005bfbc37 (patch) | |
| tree | 994cff2304e1e27c30722fb9dc52e89c4965fe09 /src | |
| parent | 70e9f39931c1bc15846b9d0994ba4a69fc6f4a65 (diff) | |
| download | emacs-ec07b64b8eef75156015cbea689919c005bfbc37.tar.gz emacs-ec07b64b8eef75156015cbea689919c005bfbc37.zip | |
(Fsetq): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/eval.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e507754c0ba..2a68c99d328 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2007-07-15 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * data.c (Fsetq_default): Doc fix. | ||
| 4 | |||
| 5 | * eval.c (Fsetq): Doc fix. | ||
| 6 | |||
| 1 | 2007-07-11 Jason Rumney <jasonr@gnu.org> | 7 | 2007-07-11 Jason Rumney <jasonr@gnu.org> |
| 2 | 8 | ||
| 3 | * makefile.w32-in (LIBS): Include OLE32. | 9 | * makefile.w32-in (LIBS): Include OLE32. |
diff --git a/src/eval.c b/src/eval.c index 6707849a840..4ce5c6d05a9 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -97,6 +97,7 @@ Lisp_Object Qinhibit_quit, Vinhibit_quit, Vquit_flag; | |||
| 97 | Lisp_Object Qand_rest, Qand_optional; | 97 | Lisp_Object Qand_rest, Qand_optional; |
| 98 | Lisp_Object Qdebug_on_error; | 98 | Lisp_Object Qdebug_on_error; |
| 99 | Lisp_Object Qdeclare; | 99 | Lisp_Object Qdeclare; |
| 100 | Lisp_Object Qdebug; | ||
| 100 | 101 | ||
| 101 | /* This holds either the symbol `run-hooks' or nil. | 102 | /* This holds either the symbol `run-hooks' or nil. |
| 102 | It is nil at an early stage of startup, and when Emacs | 103 | It is nil at an early stage of startup, and when Emacs |
| @@ -530,7 +531,7 @@ Thus, (setq x (1+ y)) sets `x' to the value of `(1+ y)'. | |||
| 530 | The second VAL is not computed until after the first SYM is set, and so on; | 531 | The second VAL is not computed until after the first SYM is set, and so on; |
| 531 | each VAL can use the new value of variables set earlier in the `setq'. | 532 | each VAL can use the new value of variables set earlier in the `setq'. |
| 532 | The return value of the `setq' form is the value of the last VAL. | 533 | The return value of the `setq' form is the value of the last VAL. |
| 533 | usage: (setq SYM VAL SYM VAL ...) */) | 534 | usage: (setq [SYM VAL]...) */) |
| 534 | (args) | 535 | (args) |
| 535 | Lisp_Object args; | 536 | Lisp_Object args; |
| 536 | { | 537 | { |
| @@ -3600,6 +3601,9 @@ before making `inhibit-quit' nil. */); | |||
| 3600 | Qand_optional = intern ("&optional"); | 3601 | Qand_optional = intern ("&optional"); |
| 3601 | staticpro (&Qand_optional); | 3602 | staticpro (&Qand_optional); |
| 3602 | 3603 | ||
| 3604 | Qdebug = intern ("debug"); | ||
| 3605 | staticpro (&Qdebug); | ||
| 3606 | |||
| 3603 | DEFVAR_LISP ("stack-trace-on-error", &Vstack_trace_on_error, | 3607 | DEFVAR_LISP ("stack-trace-on-error", &Vstack_trace_on_error, |
| 3604 | doc: /* *Non-nil means errors display a backtrace buffer. | 3608 | doc: /* *Non-nil means errors display a backtrace buffer. |
| 3605 | More precisely, this happens for any error that is handled | 3609 | More precisely, this happens for any error that is handled |