aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-06 19:53:19 -0700
committerPaul Eggert2011-04-06 19:53:19 -0700
commitb189fa667ed7ac7b17f9665cd8a0c26316b3c521 (patch)
tree0e6fae139f899cc8e1b2cebedc0171eab437a580 /src
parentbff87ef0301f6039ffcf1f2eb5503fa262a32285 (diff)
downloademacs-b189fa667ed7ac7b17f9665cd8a0c26316b3c521.tar.gz
emacs-b189fa667ed7ac7b17f9665cd8a0c26316b3c521.zip
* eval.c (internal_lisp_condition_case): Don't pass spurious arg.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/eval.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d31710bcbca..6f2509429d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-07 Paul Eggert <eggert@cs.ucla.edu> 12011-04-07 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * eval.c (internal_lisp_condition_case): Don't pass spurious arg.
4
3 * keyboard.c (access_keymap_keyremap): Print func name, not garbage. 5 * keyboard.c (access_keymap_keyremap): Print func name, not garbage.
4 6
52011-04-06 Paul Eggert <eggert@cs.ucla.edu> 72011-04-06 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/src/eval.c b/src/eval.c
index 93da7799bec..8b029967e7a 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1401,7 +1401,7 @@ internal_lisp_condition_case (volatile Lisp_Object var, Lisp_Object bodyform,
1401 || (CONSP (tem) 1401 || (CONSP (tem)
1402 && (SYMBOLP (XCAR (tem)) 1402 && (SYMBOLP (XCAR (tem))
1403 || CONSP (XCAR (tem)))))) 1403 || CONSP (XCAR (tem))))))
1404 error ("Invalid condition handler", tem); 1404 error ("Invalid condition handler");
1405 } 1405 }
1406 1406
1407 c.tag = Qnil; 1407 c.tag = Qnil;