[Emacs-diffs] emacs/lisp ChangeLog facemenu.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/16 05:25:25

Modified files:
        lisp           : ChangeLog facemenu.el 

Log message:
        * facemenu.el (facemenu-read-color): Use a completion function
        that accepts any defined color, such as RGB triplets (Bug#3677).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15941&r2=1.15942
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/facemenu.el?cvsroot=emacs&r1=1.108&r2=1.109

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15941
retrieving revision 1.15942
diff -u -b -r1.15941 -r1.15942
--- ChangeLog   16 Aug 2009 00:31:28 -0000      1.15941
+++ ChangeLog   16 Aug 2009 05:25:21 -0000      1.15942
@@ -1,5 +1,8 @@
 2009-08-16  Chong Yidong  <address@hidden>
 
+       * facemenu.el (facemenu-read-color): Use a completion function
+       that accepts any defined color, such as RGB triplets (Bug#3677).
+
        * files.el (get-free-disk-space): Change fallback default
        directory to /.  Expand DIR argument before switching to fallback.
        Suggested by Kevin Ryde (Bug#2631, Bug#3911).

Index: facemenu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/facemenu.el,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- facemenu.el 18 Apr 2009 13:50:23 -0000      1.108
+++ facemenu.el 16 Aug 2009 05:25:25 -0000      1.109
@@ -460,11 +460,17 @@
 (defun facemenu-read-color (&optional prompt)
   "Read a color using the minibuffer."
   (let* ((completion-ignore-case t)
-        (require-match (not (eq window-system 'ns)))
-        (col (completing-read (or prompt "Color: ")
-                              (or facemenu-color-alist
-                                  (defined-colors))
-                              nil require-match)))
+        (color-list (or facemenu-color-alist (defined-colors)))
+        (completer
+         (lambda (string pred all-completions)
+           (if all-completions
+               (or (all-completions string color-list pred)
+                   (if (color-defined-p string)
+                       (list string)))
+             (or (try-completion string color-list pred)
+                 (if (color-defined-p string)
+                     string)))))
+        (col (completing-read (or prompt "Color: ") completer nil t)))
     (if (equal "" col)
        nil
       col)))