[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100143: Misc tweaks.
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100143: Misc tweaks. |
Date: |
Tue, 04 May 2010 13:44:54 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100143
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-04 13:44:54 -0400
message:
Misc tweaks.
* eval.c (Fdefvaralias): Remove unintended nested if.
(internal_condition_case_2, internal_condition_case_n): Use ANSI type.
modified:
src/ChangeLog
src/eval.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-04 16:03:23 +0000
+++ b/src/ChangeLog 2010-05-04 17:44:54 +0000
@@ -1,3 +1,9 @@
+2010-05-04 Stefan Monnier <address@hidden>
+
+ Misc tweaks.
+ * eval.c (Fdefvaralias): Remove unintended nested if.
+ (internal_condition_case_2, internal_condition_case_n): Use ANSI type.
+
2010-05-04 Bernhard Herzog <address@hidden> (tiny change)
* xsmfns.c (smc_save_yourself_CB): strlen(client_id) => strlen(cwd).
=== modified file 'src/eval.c'
--- a/src/eval.c 2010-05-03 15:01:21 +0000
+++ b/src/eval.c 2010-05-04 17:44:54 +0000
@@ -770,11 +770,8 @@
sym = XSYMBOL (new_alias);
if (sym->constant)
- if (sym->redirect == SYMBOL_VARALIAS)
- sym->constant = 0; /* Reset. */
- else
- /* Not sure why. */
- error ("Cannot make a constant an alias");
+ /* Not sure why, but why not? */
+ error ("Cannot make a constant an alias");
switch (sym->redirect)
{
@@ -1567,12 +1564,11 @@
its arguments. */
Lisp_Object
-internal_condition_case_2 (bfun, arg1, arg2, handlers, hfun)
- Lisp_Object (*bfun) ();
- Lisp_Object arg1;
- Lisp_Object arg2;
- Lisp_Object handlers;
- Lisp_Object (*hfun) ();
+internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object),
+ Lisp_Object arg1,
+ Lisp_Object arg2,
+ Lisp_Object handlers,
+ Lisp_Object (*hfun) (Lisp_Object))
{
Lisp_Object val;
struct catchtag c;
@@ -1617,12 +1613,11 @@
and ARGS as second argument. */
Lisp_Object
-internal_condition_case_n (bfun, nargs, args, handlers, hfun)
- Lisp_Object (*bfun) ();
- int nargs;
- Lisp_Object *args;
- Lisp_Object handlers;
- Lisp_Object (*hfun) ();
+internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*),
+ int nargs,
+ Lisp_Object *args,
+ Lisp_Object handlers,
+ Lisp_Object (*hfun) (Lisp_Object))
{
Lisp_Object val;
struct catchtag c;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100143: Misc tweaks.,
Stefan Monnier <=