Merge from origin/emacs-24

[gnu-emacs] / lisp / facemenu.el

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 24613ecd236d9a876b907e2adff5ab51d7aaf285..2c246b44d546a079eb34158c57eb80f87d1f8602 100644 (file)
--- 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-2014 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