From: Miles Bader <miles@gnu.org>
Date: Thu, 27 Dec 2001 15:09:44 +0000 (+0000)
Subject: (widget-toggle-value-create): Don't eval actual images (which are lists too).
X-Git-Tag: ttn-vms-21-2-B4~17458
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3058e43675087a8c3b58ffe5fb7d0fc3d7fc9f45;p=emacs.git

(widget-toggle-value-create): Don't eval actual images (which are lists too).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed4c52feb65..5c81402826a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-28  Miles Bader  <miles@gnu.org>
+
+	* wid-edit.el (widget-toggle-value-create): Don't eval actual
+	images (which are lists too).
+
 2001-12-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* language/european.el: Fix the doc string of "Latin-5" language
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index c9b962ef06a..ca6bd1dc3a4 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2001,21 +2001,20 @@ when he invoked the menu."
 (defun widget-toggle-value-create (widget)
   "Insert text representing the `on' and `off' states."
   (if (widget-value widget)
-      (progn
+      (let ((image (widget-get widget :on-glyph)))
 	(and (display-graphic-p)
-	     (listp (widget-get widget :on-glyph))
-	     (widget-put widget :on-glyph
-			 (eval (widget-get widget :on-glyph))))
+	     (listp image)
+	     (not (eq (car image) 'image))
+	     (widget-put widget :on-glyph (setq image (eval image))))
 	(widget-image-insert widget
 			     (widget-get widget :on)
-			     (widget-get widget :on-glyph)))
-    (and (display-graphic-p)
-	 (listp (widget-get widget :off-glyph))
-	 (widget-put widget :off-glyph
-		     (eval (widget-get widget :off-glyph))))
-    (widget-image-insert widget
-			 (widget-get widget :off)
-			 (widget-get widget :off-glyph))))
+			     image))
+    (let ((image (widget-get widget :off-glyph)))
+      (and (display-graphic-p)
+	   (listp image)
+	   (not (eq (car image) 'image))
+	   (widget-put widget :off-glyph (setq image (eval image))))
+      (widget-image-insert widget (widget-get widget :off) image))))
 
 (defun widget-toggle-action (widget &optional event)
   ;; Toggle value.