diff options
| author | Richard M. Stallman | 1994-11-13 19:07:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-11-13 19:07:26 +0000 |
| commit | 7812a96f4bdecafb2635439ea3f09037a51aef43 (patch) | |
| tree | 50b2a79eaeca0941277a5bf81b5e8a7cdb0b56f5 /src | |
| parent | 169e69a3951d0d86bc2380e0187a01a6d35e3e25 (diff) | |
| download | emacs-7812a96f4bdecafb2635439ea3f09037a51aef43.tar.gz emacs-7812a96f4bdecafb2635439ea3f09037a51aef43.zip | |
(load_pixmap): Handle bitmap_id < 0. F is a FRAME_PTR.
Diffstat (limited to 'src')
| -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, | |||
| 415 | 415 | ||
| 416 | static long | 416 | static long |
| 417 | load_pixmap (f, name, w_ptr, h_ptr) | 417 | load_pixmap (f, name, w_ptr, h_ptr) |
| 418 | FRAME_PTR *f; | 418 | FRAME_PTR f; |
| 419 | Lisp_Object name; | 419 | Lisp_Object name; |
| 420 | unsigned int *w_ptr, *h_ptr; | 420 | unsigned int *w_ptr, *h_ptr; |
| 421 | { | 421 | { |
| @@ -452,8 +452,8 @@ load_pixmap (f, name, w_ptr, h_ptr) | |||
| 452 | } | 452 | } |
| 453 | UNBLOCK_INPUT; | 453 | UNBLOCK_INPUT; |
| 454 | 454 | ||
| 455 | if (! bitmap_id) | 455 | if (bitmap_id < 0) |
| 456 | Fsignal (Qerror, Fcons (build_string ("undefined bitmap"), | 456 | Fsignal (Qerror, Fcons (build_string ("invalid or undefined bitmap"), |
| 457 | Fcons (name, Qnil))); | 457 | Fcons (name, Qnil))); |
| 458 | 458 | ||
| 459 | *w_ptr = x_bitmap_width (f, bitmap_id); | 459 | *w_ptr = x_bitmap_width (f, bitmap_id); |