procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(Fautoload_do_load): Fix up docstring.
This commit is contained in:
Lee Duhem 2014-12-04 14:13:13 -05:00 • committed by Stefan Monnier
parent e3c24b171b
commit c1c2cee7c5
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
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>
* nsterm.m (represented_filename, represented_frame): New variables.

6
src/eval.c
View file

@ -1536,8 +1536,7 @@ See also the function `condition-case'. */)
|| NILP (clause)
/* A `debug' symbol in the handler list disables the normal
suppression of the debugger. */
|| (CONSP (clause) && CONSP (clause)
&& !NILP (Fmemq (Qdebug, clause)))
|| (CONSP (clause) && !NILP (Fmemq (Qdebug, clause)))
/* Special handler that means "print a message and run debugger
if requested". */
|| EQ (h->tag_or_ch, Qerror)))
@ -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,
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
it is defines a macro. */)
it defines a macro. */)
(Lisp_Object fundef, Lisp_Object funname, Lisp_Object macro_only)
{
ptrdiff_t count = SPECPDL_INDEX ();
@ -3502,7 +3501,6 @@ backtrace_eval_unrewind (int distance)
for (; distance > 0; distance--)
{
tmp += step;
/* */
switch (tmp->kind)
{
/* FIXME: Ideally we'd like to "temporarily unwind" (some of) those