aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/wid-edit.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen2021-03-18 05:55:16 +0100
committerLars Ingebrigtsen2021-03-18 05:55:16 +0100
commit6a75b6fcb10725fb1e352dec506b84e795baa7c8 (patch)
tree76e677f5f5cb941d8554e03eb3b1064933b9b311 /lisp/wid-edit.el
parent1e9c9ebee3e13773400fe93bf26db923a880be6d (diff)
downloademacs-6a75b6fcb10725fb1e352dec506b84e795baa7c8.tar.gz
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/wid-edit.el')
-rw-r--r--lisp/wid-edit.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 35e7b9ce7e1..e71290c7ef9 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -4034,7 +4034,7 @@ is inline."
4034 (mapcar #'length (defined-colors)))) 4034 (mapcar #'length (defined-colors))))
4035 :tag "Color" 4035 :tag "Color"
4036 :value "black" 4036 :value "black"
4037 :completions (or facemenu-color-alist (defined-colors)) 4037 :completions (defined-colors)
4038 :sample-face-get 'widget-color-sample-face-get 4038 :sample-face-get 'widget-color-sample-face-get
4039 :notify 'widget-color-notify 4039 :notify 'widget-color-notify
4040 :match #'widget-color-match 4040 :match #'widget-color-match
@@ -4049,7 +4049,10 @@ is inline."
4049 :tag " Choose " :action 'widget-color--choose-action) 4049 :tag " Choose " :action 'widget-color--choose-action)
4050 (widget-insert " ")) 4050 (widget-insert " "))
4051 4051
4052(declare-function list-colors-display "facemenu")
4053
4052(defun widget-color--choose-action (widget &optional _event) 4054(defun widget-color--choose-action (widget &optional _event)
4055 (require 'facemenu)
4053 (list-colors-display 4056 (list-colors-display
4054 nil nil 4057 nil nil
4055 (let ((cbuf (current-buffer)) 4058 (let ((cbuf (current-buffer))
@@ -4072,8 +4075,11 @@ is inline."
4072 (list (cons 'foreground-color value)) 4075 (list (cons 'foreground-color value))
4073 'default))) 4076 'default)))
4074 4077
4078(declare-function facemenu-read-color "facemenu")
4079
4075(defun widget-color-action (widget &optional event) 4080(defun widget-color-action (widget &optional event)
4076 "Prompt for a color." 4081 "Prompt for a color."
4082 (require 'facemenu)
4077 (let* ((tag (widget-apply widget :menu-tag-get)) 4083 (let* ((tag (widget-apply widget :menu-tag-get))
4078 (prompt (concat tag ": ")) 4084 (prompt (concat tag ": "))
4079 (answer (facemenu-read-color prompt))) 4085 (answer (facemenu-read-color prompt)))