X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4431e6d9b30062407a60897db58356a36cedf49f..a50c95dbd24eb0e56ad0eb0f8ff2c013b5f92285:/lisp/facemenu.el

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index eb4554585a..2c246b44d5 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -1,6 +1,6 @@
 ;;; facemenu.el --- create a face menu for interactively adding fonts to text
 
-;; Copyright (C) 1994-1996, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1996, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: faces
@@ -620,7 +620,7 @@ color.  The function should accept a single argument, the color name."
 		 'help-echo
 		 (let ((hsv (apply 'color-rgb-to-hsv
 				   (color-name-to-rgb (car color)))))
-		   (format "H:%d S:%d V:%d"
+		   (format "H:%.2f S:%.2f V:%.2f"
 			   (nth 0 hsv) (nth 1 hsv) (nth 2 hsv)))))
 	(when callback
 	  (make-text-button
@@ -732,7 +732,7 @@ effect.  See `facemenu-remove-face-function'."
                                  face
                                (facemenu-active-faces
                                 (cons face
-                                      (if (listp prev)
+                                      (if (face-list-p prev)
                                           prev
                                         (list prev)))
                                 ;; Specify the selected frame