summaryrefslogtreecommitdiff
path: root/lisp/facemenu.el
diff options
context:
space:
mode:
authorAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-15 18:15:18 +0000
committerAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-15 18:15:18 +0000
commit44fbaf8dbf48607a410eb71044934b90b84d9f23 (patch)
tree7d4ed52d5d577cd447fb5134be07fde184f493f4 /lisp/facemenu.el
parent691e329080abb159f73cef723912a41e0169c6d8 (diff)
downloademacs-44fbaf8dbf48607a410eb71044934b90b84d9f23.tar.gz
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'lisp/facemenu.el')
-rw-r--r--lisp/facemenu.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 39d518cf52d..a6d83f949f6 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -460,10 +460,11 @@ These special properties include `invisible', `intangible' and `read-only'."
(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)))