[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 c1c2cee 2/2: * src/eval.c (Fsignal): Remove dupli
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 c1c2cee 2/2: * src/eval.c (Fsignal): Remove duplicate test. |
Date: |
Thu, 04 Dec 2014 19:17:28 +0000 |
branch: emacs-24
commit c1c2cee7c5ae1eff6edb198814423e55cb11cc73
Author: Lee Duhem <address@hidden>
Commit: Stefan Monnier <address@hidden>
* src/eval.c (Fsignal): Remove duplicate test.
(Fautoload_do_load): Fix up docstring.
---
src/ChangeLog | 5 +++++
src/eval.c | 6 ++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 952e4ab..0a8acf9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-04 Lee Duhem <address@hidden> (tiny change)
+
+ * eval.c (Fsignal): Remove duplicate test.
+ (Fautoload_do_load): Fix up docstring.
+
2014-12-02 Jan Djärv <address@hidden>
* nsterm.m (represented_filename, represented_frame): New variables.
diff --git a/src/eval.c b/src/eval.c
index 929b98e..f0ad999 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -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