diff options
| author | Erik Naggum <erik@naggum.no> | 1996-01-09 00:34:18 +0000 |
|---|---|---|
| committer | Erik Naggum <erik@naggum.no> | 1996-01-09 00:34:18 +0000 |
| commit | 1f49ffb3a7f16504771feecd754c53a5a29fe562 (patch) | |
| tree | 4637cd52c28dbb2c75a11f6749db7120ed187ce2 | |
| parent | 8445e5d9b33e0911116cce224a3b7034292d7ed8 (diff) | |
| download | emacs-1f49ffb3a7f16504771feecd754c53a5a29fe562.tar.gz | |
(Fpixmap_spec_p): Harmonize arguments with documentation.
| -rw-r--r-- | src/xfaces.c | 24 |
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) } DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0, - "Return t if ARG is a valid pixmap specification.") - (arg) - Lisp_Object arg; + "Return t if OBJECT is a valid pixmap specification.") + (object) + Lisp_Object object; { Lisp_Object height, width; - return ((STRINGP (arg) - || (CONSP (arg) - && CONSP (XCONS (arg)->cdr) - && CONSP (XCONS (XCONS (arg)->cdr)->cdr) - && NILP (XCONS (XCONS (XCONS (arg)->cdr)->cdr)->cdr) - && (width = XCONS (arg)->car, INTEGERP (width)) - && (height = XCONS (XCONS (arg)->cdr)->car, INTEGERP (height)) - && STRINGP (XCONS (XCONS (XCONS (arg)->cdr)->cdr)->car) + return ((STRINGP (object) + || (CONSP (object) + && CONSP (XCONS (object)->cdr) + && CONSP (XCONS (XCONS (object)->cdr)->cdr) + && NILP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->cdr) + && (width = XCONS (object)->car, INTEGERP (width)) + && (height = XCONS (XCONS (object)->cdr)->car, INTEGERP (height)) + && STRINGP (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car) && XINT (width) > 0 && XINT (height) > 0 /* The string must have enough bits for width * height. */ - && ((XSTRING (XCONS (XCONS (XCONS (arg)->cdr)->cdr)->car)->size + && ((XSTRING (XCONS (XCONS (XCONS (object)->cdr)->cdr)->car)->size * (BITS_PER_INT / sizeof (int))) >= XFASTINT (width) * XFASTINT (height)))) ? Qt : Qnil); |