diff options
| author | Chong Yidong | 2013-12-20 14:11:00 +0800 |
|---|---|---|
| committer | Chong Yidong | 2013-12-20 14:11:00 +0800 |
| commit | a9574eb7306c56e68ad4c20d58f419b317902f1a (patch) | |
| tree | acbbf48051ff82b5b02974bcd1fe866bfa480498 | |
| parent | a2f5f4319321478cbfd4b26f9c6e7d4de776ae26 (diff) | |
| download | emacs-a9574eb7306c56e68ad4c20d58f419b317902f1a.tar.gz emacs-a9574eb7306c56e68ad4c20d58f419b317902f1a.zip | |
* faces.el (read-color): Minor fix for completion function.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/faces.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf446bc7b66..416f9a8b685 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-12-20 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * faces.el (read-color): Minor fix for completion function. | ||
| 4 | |||
| 1 | 2013-12-20 Dmitry Gutov <dgutov@yandex.ru> | 5 | 2013-12-20 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 6 | ||
| 3 | * progmodes/ruby-mode.el (ruby-align-to-stmt-keywords): New | 7 | * progmodes/ruby-mode.el (ruby-align-to-stmt-keywords): New |
diff --git a/lisp/faces.el b/lisp/faces.el index 3797056b167..14be52a717c 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1836,7 +1836,7 @@ resulting color name in the echo area." | |||
| 1836 | (if (color-defined-p string) | 1836 | (if (color-defined-p string) |
| 1837 | (list string)))) | 1837 | (list string)))) |
| 1838 | ((eq flag 'lambda) ; Test completion. | 1838 | ((eq flag 'lambda) ; Test completion. |
| 1839 | (or (memq string colors) | 1839 | (or (member string colors) |
| 1840 | (color-defined-p string))))) | 1840 | (color-defined-p string))))) |
| 1841 | nil t))) | 1841 | nil t))) |
| 1842 | 1842 | ||