diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2003-12-28 16:05:28 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2003-12-28 16:05:28 +0000 |
commit | 8ed48c277afad174675b3d6dcb8e7b00a4bcc97d (patch) | |
tree | 53d9baa35f9420264e2f53ad4db850c400c3e2c6 /src/w32fns.c | |
parent | 2e7f2ec031f1708b80df9dc1f60f6b1cb24a5c02 (diff) | |
parent | 69348b2a71cbabeb23e3b7d5dce354c5bc4bd311 (diff) | |
download | emacs-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/w32fns.c')
-rw-r--r-- | src/w32fns.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index d8572265bef..7bffea34a28 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6937,11 +6937,6 @@ DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0, static struct image_type *image_types; -/* The symbol `image' which is the car of the lists used to represent - images in Lisp. */ - -extern Lisp_Object Qimage; - /* The symbol `xbm' which is used as the type symbol for XBM images. */ Lisp_Object Qxbm; @@ -7021,7 +7016,7 @@ valid_image_p (object) { int valid_p = 0; - if (CONSP (object) && EQ (XCAR (object), Qimage)) + if (IMAGEP (object)) { Lisp_Object tem; @@ -7123,7 +7118,7 @@ parse_image_spec (spec, keywords, nkeywords, type) int i; Lisp_Object plist; - if (!CONSP (spec) || !EQ (XCAR (spec), Qimage)) + if (!IMAGEP (spec)) return 0; plist = XCDR (spec); |