aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Naggum1996-01-09 00:34:18 +0000
committerErik Naggum1996-01-09 00:34:18 +0000
commited791d5b69604d1d2d136c1b098760dd90b78b4d (patch)
tree88f86e97c1b87393a0c74ffe0e1ae23dc4995bae
parent413430c5d87bd29a804c7976c02f1bd0505bc4d2 (diff)
downloademacs-ed791d5b69604d1d2d136c1b098760dd90b78b4d.tar.gz
emacs-ed791d5b69604d1d2d136c1b098760dd90b78b4d.zip
(Fpixmap_spec_p): Harmonize arguments with documentation.
-rw-r--r--src/xfaces.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 36a2fe0e839..1c0ed8e6bea 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -424,24 +424,24 @@ unload_color (f, pixel)
424} 424}
425 425
426DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0, 426DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0,
427 "Return t if ARG is a valid pixmap specification.") 427 "Return t if OBJECT is a valid pixmap specification.")
428 (arg) 428 (object)
429 Lisp_Object arg; 429 Lisp_Object object;
430{ 430{
431 Lisp_Object height, width; 431 Lisp_Object height, width;
432 432
433 return ((STRINGP (arg) 433 return ((STRINGP (object)
434 || (CONSP (arg) 434 || (CONSP (object)
435 && CONSP (XCONS (arg)->cdr) 435 && CONSP (XCONS (object)->cdr)
436 && CONSP (XCONS (XCONS (arg)->cdr)->cdr) 436 && CONSP (XCONS (XCONS (object)->cdr)->cdr)
437 && NILP (XCONS (XCONS (XCONS (arg)->cdr)->cdr)->cdr) 437 && NILP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->cdr)
438 && (width = XCONS (arg)->car, INTEGERP (width)) 438 && (width = XCONS (object)->car, INTEGERP (width))
439 && (height = XCONS (XCONS (arg)->cdr)->car, INTEGERP (height)) 439 && (height = XCONS (XCONS (object)->cdr)->car, INTEGERP (height))
440 && STRINGP (XCONS (XCONS (XCONS (arg)->cdr)->cdr)->car) 440 && STRINGP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car)
441 && XINT (width) > 0 441 && XINT (width) > 0
442 && XINT (height) > 0 442 && XINT (height) > 0
443 /* The string must have enough bits for width * height. */ 443 /* The string must have enough bits for width * height. */
444 && ((XSTRING (XCONS (XCONS (XCONS (arg)->cdr)->cdr)->car)->size 444 && ((XSTRING (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car)->size
445 * (BITS_PER_INT / sizeof (int))) 445 * (BITS_PER_INT / sizeof (int)))
446 >= XFASTINT (width) * XFASTINT (height)))) 446 >= XFASTINT (width) * XFASTINT (height))))
447 ? Qt : Qnil); 447 ? Qt : Qnil);