Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 113-115)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90

1 files changed, 2 insertions, 2 deletions

diff --git a/src/doc.c b/src/doc.c
index a69c3cf4382..ecb0197b3ca 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -416,7 +416,7 @@ string is passed through `substitute-command-keys'.  */)
     {
       funcar = Fcar (fun);
       if (!SYMBOLP (funcar))
-        return Fsignal (Qinvalid_function, Fcons (fun, Qnil));
+        xsignal1 (Qinvalid_function, fun);
       else if (EQ (funcar, Qkeymap))
         return build_string ("Prefix command (definition is a keymap associating keystrokes with commands).");
       else if (EQ (funcar, Qlambda)
@@ -443,7 +443,7 @@ string is passed through `substitute-command-keys'.  */)
   else
     {
     oops:
-      Fsignal (Qinvalid_function, Fcons (fun, Qnil));
+      xsignal1 (Qinvalid_function, fun);
     }
 
   /* If DOC is 0, it's typically because of a dumped file missing