summaryrefslogtreecommitdiff
path: root/src/lisp.h
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2003-12-28 16:05:28 +0000
committerKaroly Lorentey <lorentey@elte.hu>2003-12-28 16:05:28 +0000
commit8ed48c277afad174675b3d6dcb8e7b00a4bcc97d (patch)
tree53d9baa35f9420264e2f53ad4db850c400c3e2c6 /src/lisp.h
parent2e7f2ec031f1708b80df9dc1f60f6b1cb24a5c02 (diff)
parent69348b2a71cbabeb23e3b7d5dce354c5bc4bd311 (diff)
downloademacs-8ed48c277afad174675b3d6dcb8e7b00a4bcc97d.tar.gz
emacs-8ed48c277afad174675b3d6dcb8e7b00a4bcc97d.tar.bz2
emacs-8ed48c277afad174675b3d6dcb8e7b00a4bcc97d.zip
Merged in changes from CVS HEAD
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-1 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-2 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-3 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-17
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h
index de71cf7f7c9..c7a4065a96c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1381,6 +1381,10 @@ typedef unsigned char UCHAR;
#define GC_FRAMEP(x) GC_PSEUDOVECTORP (x, PVEC_FRAME)
#define SUB_CHAR_TABLE_P(x) (CHAR_TABLE_P (x) && NILP (XCHAR_TABLE (x)->top))
+
+/* Test for image (image . spec) */
+#define IMAGEP(x) (CONSP (x) && EQ (XCAR (x), Qimage))
+
#define GC_EQ(x, y) EQ (x, y)
@@ -2283,6 +2287,7 @@ extern Lisp_Object Qinhibit_point_motion_hooks;
extern Lisp_Object Qinhibit_redisplay, Qdisplay;
extern Lisp_Object Qinhibit_eval_during_redisplay;
extern Lisp_Object Qmessage_truncate_lines;
+extern Lisp_Object Qimage;
extern Lisp_Object Vmessage_log_max;
extern int message_enable_multibyte;
extern Lisp_Object echo_area_buffer[2];