Commit c1c2cee7 authored by Lee Duhem's avatar Lee Duhem Committed by Stefan Monnier
Browse files

* src/eval.c (Fsignal): Remove duplicate test.

(Fautoload_do_load): Fix up docstring.
parent e3c24b17
2014-12-04 Lee Duhem <lee.duhem@gmail.com> (tiny change)
* eval.c (Fsignal): Remove duplicate test.
(Fautoload_do_load): Fix up docstring.
2014-12-02 Jan Djärv <jan.h.d@swipnet.se> 2014-12-02 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (represented_filename, represented_frame): New variables. * nsterm.m (represented_filename, represented_frame): New variables.
......
...@@ -1536,8 +1536,7 @@ See also the function `condition-case'. */) ...@@ -1536,8 +1536,7 @@ See also the function `condition-case'. */)
|| NILP (clause) || NILP (clause)
/* A `debug' symbol in the handler list disables the normal /* A `debug' symbol in the handler list disables the normal
suppression of the debugger. */ suppression of the debugger. */
|| (CONSP (clause) && CONSP (clause) || (CONSP (clause) && !NILP (Fmemq (Qdebug, clause)))
&& !NILP (Fmemq (Qdebug, clause)))
/* Special handler that means "print a message and run debugger /* Special handler that means "print a message and run debugger
if requested". */ if requested". */
|| EQ (h->tag_or_ch, Qerror))) || EQ (h->tag_or_ch, Qerror)))
...@@ -1921,7 +1920,7 @@ DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0, ...@@ -1921,7 +1920,7 @@ DEFUN ("autoload-do-load", Fautoload_do_load, Sautoload_do_load, 1, 3, 0,
If non-nil, FUNNAME should be the symbol whose function value is FUNDEF, If non-nil, FUNNAME should be the symbol whose function value is FUNDEF,
in which case the function returns the new autoloaded function value. in which case the function returns the new autoloaded function value.
If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if If equal to `macro', MACRO-ONLY specifies that FUNDEF should only be loaded if
it is defines a macro. */) it defines a macro. */)
(Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only) (Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only)
{ {
ptrdiff_t count = SPECPDL_INDEX (); ptrdiff_t count = SPECPDL_INDEX ();
...@@ -3502,7 +3501,6 @@ backtrace_eval_unrewind (int distance) ...@@ -3502,7 +3501,6 @@ backtrace_eval_unrewind (int distance)
for (; distance > 0; distance--) for (; distance > 0; distance--)
{ {
tmp += step; tmp += step;
/* */
switch (tmp->kind) switch (tmp->kind)
{ {
/* FIXME: Ideally we'd like to "temporarily unwind" (some of) those /* FIXME: Ideally we'd like to "temporarily unwind" (some of) those
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment