[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/lisp.h,v
From: |
Michael Cadilhac |
Subject: |
[Emacs-diffs] Changes to emacs/src/lisp.h,v |
Date: |
Mon, 10 Sep 2007 09:40:27 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Cadilhac <cadilhac> 07/09/10 09:40:27
Index: lisp.h
===================================================================
RCS file: /sources/emacs/emacs/src/lisp.h,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -b -r1.583 -r1.584
--- lisp.h 29 Aug 2007 21:50:08 -0000 1.583
+++ lisp.h 10 Sep 2007 09:40:26 -0000 1.584
@@ -891,7 +891,7 @@
Lisp_Object (*function) ();
short min_args, max_args;
char *symbol_name;
- char *prompt;
+ char *intspec;
char *doc;
};
@@ -1669,30 +1669,33 @@
followed by the address of a vector of Lisp_Objects
which contains the argument values.
UNEVALLED means pass the list of unevaluated arguments
- `prompt' says how to read arguments for an interactive call.
- See the doc string for `interactive'.
+ `intspec' says how interactive arguments are to be fetched.
+ If the string starts with a `(', `intspec' is evaluated and the resulting
+ list is the list of arguments.
+ If it's a string that doesn't start with `(', the value should follow
+ the one of the doc string for `interactive'.
A null string means call interactively with no arguments.
`doc' is documentation for the user. */
#if (!defined (__STDC__) && !defined (PROTOTYPES)) \
|| defined (USE_NONANSI_DEFUN)
-#define DEFUN(lname, fnname, sname, minargs, maxargs, prompt, doc) \
+#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \
Lisp_Object fnname (); \
DECL_ALIGN (struct Lisp_Subr, sname) = \
{ PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)), \
- fnname, minargs, maxargs, lname, prompt, 0}; \
+ fnname, minargs, maxargs, lname, intspec, 0}; \
Lisp_Object fnname
#else
/* This version of DEFUN declares a function prototype with the right
arguments, so we can catch errors with maxargs at compile-time. */
-#define DEFUN(lname, fnname, sname, minargs, maxargs, prompt, doc) \
+#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \
Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \
DECL_ALIGN (struct Lisp_Subr, sname) = \
{ PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)), \
- fnname, minargs, maxargs, lname, prompt, 0}; \
+ fnname, minargs, maxargs, lname, intspec, 0}; \
Lisp_Object fnname
/* Note that the weird token-substitution semantics of ANSI C makes
- [Emacs-diffs] Changes to emacs/src/lisp.h,v,
Michael Cadilhac <=
- [Emacs-diffs] Changes to emacs/src/lisp.h,v, Stefan Monnier, 2007/09/20
- [Emacs-diffs] Changes to emacs/src/lisp.h,v, Stefan Monnier, 2007/09/21
- [Emacs-diffs] Changes to emacs/src/lisp.h,v, Glenn Morris, 2007/09/22
- [Emacs-diffs] Changes to emacs/src/lisp.h,v, Stefan Monnier, 2007/09/29