diff options
| author | Lee Duhem | 2014-12-04 14:13:13 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-12-04 14:13:13 -0500 |
| commit | c1c2cee7c5ae1eff6edb198814423e55cb11cc73 (patch) | |
| tree | a18746f3d001949f9f1a9dc710707873bf065b6b /src/eval.c | |
| parent | e3c24b171bfff16fb808cb02d3fc5eaff017c1bc (diff) | |
| download | emacs-c1c2cee7c5ae1eff6edb198814423e55cb11cc73.tar.gz emacs-c1c2cee7c5ae1eff6edb198814423e55cb11cc73.zip | |
* src/eval.c (Fsignal): Remove duplicate test.
(Fautoload_do_load): Fix up docstring.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index 929b98e9f71..f0ad999f0f8 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1536,8 +1536,7 @@ See also the function `condition-case'. */) | |||
| 1536 | || NILP (clause) | 1536 | || NILP (clause) |
| 1537 | /* A `debug' symbol in the handler list disables the normal | 1537 | /* A `debug' symbol in the handler list disables the normal |
| 1538 | suppression of the debugger. */ | 1538 | suppression of the debugger. */ |
| 1539 | || (CONSP (clause) && CONSP (clause) | 1539 | || (CONSP (clause) && !NILP (Fmemq (Qdebug, clause))) |
| 1540 | && !NILP (Fmemq (Qdebug, clause))) | ||
| 1541 | /* Special handler that means "print a message and run debugger | 1540 | /* Special handler that means "print a message and run debugger |
| 1542 | if requested". */ | 1541 | if requested". */ |
| 1543 | || EQ (h->tag_or_ch, Qerror))) | 1542 | || EQ (h->tag_or_ch, Qerror))) |
| @@ -1921,7 +1920,7 @@ DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0, | |||
| 1921 | If non-nil, FUNNAME should be the symbol whose function value is FUNDEF, | 1920 | If non-nil, FUNNAME should be the symbol whose function value is FUNDEF, |
| 1922 | in which case the function returns the new autoloaded function value. | 1921 | in which case the function returns the new autoloaded function value. |
| 1923 | If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if | 1922 | If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if |
| 1924 | it is defines a macro. */) | 1923 | it defines a macro. */) |
| 1925 | (Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only) | 1924 | (Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only) |
| 1926 | { | 1925 | { |
| 1927 | ptrdiff_t count = SPECPDL_INDEX (); | 1926 | ptrdiff_t count = SPECPDL_INDEX (); |
| @@ -3502,7 +3501,6 @@ backtrace_eval_unrewind (int distance) | |||
| 3502 | for (; distance > 0; distance--) | 3501 | for (; distance > 0; distance--) |
| 3503 | { | 3502 | { |
| 3504 | tmp += step; | 3503 | tmp += step; |
| 3505 | /* */ | ||
| 3506 | switch (tmp->kind) | 3504 | switch (tmp->kind) |
| 3507 | { | 3505 | { |
| 3508 | /* FIXME: Ideally we'd like to "temporarily unwind" (some of) those | 3506 | /* FIXME: Ideally we'd like to "temporarily unwind" (some of) those |