diff lisp/facemenu.el @ 96675:d45acf0c8d23

merging Emacs.app (NeXTstep port)

--- a/lisp/facemenu.el	Tue Jul 15 15:45:05 2008 +0000
+++ b/lisp/facemenu.el	Tue Jul 15 18:15:18 2008 +0000
@@ -460,10 +460,11 @@
 (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 t)))
+			       nil require-match)))
     (if (equal "" col)
 	nil
       col)))