# HG changeset patch
# User aidan
# Date 1186584883 0
# Node ID 23d7fde3d773bb6368597f81b6feb7df00a4d603
# Parent  b4f4e0cc90f11f7376980cc9f97034ff8d8bfae7
[xemacs-hg @ 2007-08-08 14:54:41 by aidan]
Merge a bug fix from Sebastian Freundt's SXEmacs work.

diff -r b4f4e0cc90f1 -r 23d7fde3d773 src/ChangeLog
--- a/src/ChangeLog	Tue Aug 07 23:09:22 2007 +0000
+++ b/src/ChangeLog	Wed Aug 08 14:54:43 2007 +0000
@@ -1,3 +1,12 @@
+2007-08-08  Aidan Kehoe  <kehoea@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@muck.math.tu-berlin.de , Tue Jan 30 12:30:07 UTC
+	2007; complements 18005.16378.980760.860724@parhasard.net . 
+
 2007-07-31  Mike Sperber  <mike@xemacs.org>
 
 	* file-coding.c (undecided_convert): Kludge to prevent infinite
diff -r b4f4e0cc90f1 -r 23d7fde3d773 src/eval.c
--- a/src/eval.c	Tue Aug 07 23:09:22 2007 +0000
+++ b/src/eval.c	Wed Aug 08 14:54:43 2007 +0000
@@ -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);