[COMMIT] Merge a bug fix from Sebastian Freundt's SXEmacs work

Aidan Kehoe kehoea at parhasard.net
Wed Aug 8 10:58:02 EDT 2007


APPROVE COMMIT

NOTE: This patch has been committed.

src/ChangeLog addition:

2007-08-08  Aidan Kehoe  <kehoea at parhasard.net>

	* eval.c (Feval): fix, stick with original error messages instead
	of referring to the indirected function.
	From Sebastian Freundt's mail
	nhtfy9sitjf.fsf at muck.math.tu-berlin.de . 


XEmacs Trunk source patch:
Diff command:   cvs -q diff -u
Files affected: src/eval.c
===================================================================
RCS

Index: src/eval.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v
retrieving revision 1.97
diff -u -r1.97 eval.c
--- src/eval.c	2007/06/22 00:21:17	1.97
+++ src/eval.c	2007/08/08 14:40:53
@@ -3799,7 +3799,12 @@
 	  goto invalid_function;
 	}
     }
-  else /* ! (SUBRP (fun) || COMPILED_FUNCTIONP (fun) || CONSP (fun)) */
+  else if (UNBOUNDP (fun))
+    {
+      val = signal_void_function_error (original_fun);
+    }
+  else /* ! (SUBRP (fun) || COMPILED_FUNCTIONP (fun) || CONSP (fun)
+             UNBOUNDP (fun)) */
     {
     invalid_function:
       val = signal_invalid_function_error (fun);

-- 
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)



More information about the XEmacs-Patches mailing list