diff options
| author | Karoly Lorentey | 2004-04-03 20:24:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-04-03 20:24:17 +0000 |
| commit | 1ba538094c4cd3da172d91878fa76d96c6b1cbd2 (patch) | |
| tree | d9379406f3598de5db893fd0f01d6ae214a711d1 /src/lisp.h | |
| parent | b04f5ad2cc0f71e567ec9ee49351f45f0a5faa3a (diff) | |
| parent | 9f691b0dd903205d12e447c753bcd92741c68707 (diff) | |
| download | emacs-1ba538094c4cd3da172d91878fa76d96c6b1cbd2.tar.gz emacs-1ba538094c4cd3da172d91878fa76d96c6b1cbd2.zip | |
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-177
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-178
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-179
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-180
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-131
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h index 2135f80f5e8..48b9c0c7912 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2034,6 +2034,7 @@ extern Lisp_Object Qnumberp, Qnumber_or_marker_p; | |||
| 2034 | extern Lisp_Object Qinteger; | 2034 | extern Lisp_Object Qinteger; |
| 2035 | 2035 | ||
| 2036 | extern void circular_list_error P_ ((Lisp_Object)); | 2036 | extern void circular_list_error P_ ((Lisp_Object)); |
| 2037 | EXFUN (Finteractive_form, 1); | ||
| 2037 | 2038 | ||
| 2038 | /* Defined in frame.c */ | 2039 | /* Defined in frame.c */ |
| 2039 | extern Lisp_Object Qframep; | 2040 | extern Lisp_Object Qframep; |