From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 13 Nov 1994 19:07:26 +0000 (+0000)
Subject: (load_pixmap): Handle bitmap_id < 0.  F is a FRAME_PTR.
X-Git-Tag: emacs-19.34~5953
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7812a96f4bdecafb2635439ea3f09037a51aef43;p=emacs.git

(load_pixmap): Handle bitmap_id < 0.  F is a FRAME_PTR.
---

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);