diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-11-13 19:07:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-11-13 19:07:26 +0000 |
| commit | dc4a73ff4e02da5db3aa29b0333e43193cf1d450 (patch) | |
| tree | 7cc8a165743a9f0ede8f975b035ced4ef3e36d5c /src/xfaces.c | |
| parent | b7c713c8ee357b71f2d0985cf999ea9bce618fd4 (diff) | |
| download | emacs-dc4a73ff4e02da5db3aa29b0333e43193cf1d450.tar.gz | |
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 66f517b72e1..e929c204bdd 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -415,7 +415,7 @@ DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0, static long load_pixmap (f, name, w_ptr, h_ptr) - FRAME_PTR *f; + FRAME_PTR f; Lisp_Object name; unsigned int *w_ptr, *h_ptr; { @@ -452,8 +452,8 @@ load_pixmap (f, name, w_ptr, h_ptr) } UNBLOCK_INPUT; - if (! bitmap_id) - Fsignal (Qerror, Fcons (build_string ("undefined bitmap"), + if (bitmap_id < 0) + Fsignal (Qerror, Fcons (build_string ("invalid or undefined bitmap"), Fcons (name, Qnil))); *w_ptr = x_bitmap_width (f, bitmap_id); |