emacs: lisp/wid-edit.el comparison

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875

comparison

equal deleted inserted replaced

-:82b4a12fd080
+:5039706521c9
 (overlay-put overlay 'evaporate t)
 ;; We want to avoid the face with image buttons.
 (unless (widget-get widget :suppress-face)
 (overlay-put overlay 'face (widget-apply widget :button-face-get))
 (overlay-put overlay 'mouse-face
-		   (widget-apply widget :mouse-face-get)))
+		   ;; Make new list structure for the mouse-face value
+		   ;; so that different widgets will have
+		   ;; different `mouse-face' property values
+		   ;; and will highlight separately.
+		   (let ((mouse-face-value
+			  (widget-apply widget :mouse-face-get)))
+		     ;; If it's a list, copy it.
+		     (if (listp mouse-face-value)
+			 (copy-sequence mouse-face-value)
+		       ;; If it's a symbol, put it in a list.
+		       (list mouse-face-value)))))
 (overlay-put overlay 'pointer 'hand)
 (overlay-put overlay 'follow-link follow-link)
 (overlay-put overlay 'help-echo help-echo)))
 (defun widget-mouse-help (window overlay point)
 (if (and (display-graphic-p)
 	   (setq image (widget-image-find image)))
 (progn (widget-put widget :suppress-face t)
 	     (insert-image image
 			   (propertize
-			    tag 'mouse-face widget-button-pressed-face)))
+;; Use a `list' so it's unique and won't get
+;; accidentally merged with neighbouring images.
+			    tag 'mouse-face (list widget-button-pressed-face))))
 (insert tag)))
 (defun widget-move-and-invoke (event)
 "Move to where you click, and if it is an active field, invoke it."
 (interactive "e")

Mercurial > emacs