diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2021-03-18 05:55:16 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-03-18 05:55:16 +0100 |
| commit | 6a75b6fcb10725fb1e352dec506b84e795baa7c8 (patch) | |
| tree | 76e677f5f5cb941d8554e03eb3b1064933b9b311 /lisp/faces.el | |
| parent | 1e9c9ebee3e13773400fe93bf26db923a880be6d (diff) | |
| download | emacs-6a75b6fcb10725fb1e352dec506b84e795baa7c8.tar.gz emacs-6a75b6fcb10725fb1e352dec506b84e795baa7c8.tar.bz2 emacs-6a75b6fcb10725fb1e352dec506b84e795baa7c8.zip | |
Don't pre-load facemenu
* lisp/facemenu.el (facemenu-add-face-function): Move to avoid a
compilation warning.
(facemenu-color-alist): Made obsolete.
* lisp/faces.el (read-color): Don't use it.
* lisp/loadup.el ("emacs-lisp/syntax"): Don't load facemenu.
* lisp/wid-edit.el (color): Don't use facemenu-color-alist.
(widget-color--choose-action): Require facemenu.
(widget-color-action): Ditto.
* lisp/progmodes/cperl-mode.el (facemenu): Require.
* lisp/textmodes/sgml-mode.el (facemenu): Require.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 573428f1d34..7c6d749120e 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1917,12 +1917,11 @@ Interactively, or with optional arg MSG non-nil, print the resulting color name in the echo area." (interactive "i\np\ni\np") ; Always convert to RGB interactively. (let* ((completion-ignore-case t) - (colors (or facemenu-color-alist - (append '("foreground at point" "background at point") - (if allow-empty-name '("")) - (if (display-color-p) - (defined-colors-with-face-attributes) - (defined-colors))))) + (colors (append '("foreground at point" "background at point") + (if allow-empty-name '("")) + (if (display-color-p) + (defined-colors-with-face-attributes) + (defined-colors)))) (color (completing-read (or prompt "Color (name or #RGB triplet): ") ;; Completing function for reading colors, accepting |