[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/callint.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/callint.c,v |
Date: |
Mon, 10 Sep 2007 02:29:44 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 07/09/10 02:29:43
Index: callint.c
===================================================================
RCS file: /sources/emacs/emacs/src/callint.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- callint.c 29 Aug 2007 05:27:56 -0000 1.154
+++ callint.c 10 Sep 2007 02:29:42 -0000 1.155
@@ -332,22 +332,6 @@
/* Decode the kind of function. Either handle it and return,
or go to `lose' if not interactive, or set either STRING or SPECS. */
- if (SUBRP (fun))
- {
- string = (unsigned char *) XSUBR (fun)->prompt;
- if (!string)
- {
- lose:
- wrong_type_argument (Qcommandp, function);
- }
- }
- else if (COMPILEDP (fun))
- {
- if ((XVECTOR (fun)->size & PSEUDOVECTOR_SIZE_MASK) <=
COMPILED_INTERACTIVE)
- goto lose;
- specs = XVECTOR (fun)->contents[COMPILED_INTERACTIVE];
- }
- else
{
Lisp_Object form;
GCPRO2 (function, prefix_arg);
@@ -356,7 +340,7 @@
if (CONSP (form))
specs = filter_specs = Fcar (XCDR (form));
else
- goto lose;
+ wrong_type_argument (Qcommandp, function);
}
/* If either SPECS or STRING is set to a string, use it. */
@@ -368,7 +352,7 @@
bcopy (SDATA (specs), string,
SBYTES (specs) + 1);
}
- else if (string == 0)
+ else
{
Lisp_Object input;
i = num_input_events;
- [Emacs-diffs] Changes to emacs/src/callint.c,v,
Stefan Monnier <=