diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2021-02-10 20:37:10 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-02-10 20:37:14 +0100 |
| commit | 81e55fa6c37d51845b50ae22a935185cd441e99b (patch) | |
| tree | 229fb61bd41a545cb4b3da224191d0caa4457704 /lisp | |
| parent | 4467073c50d2c7fbbb30530d1a0a25f8272ff56f (diff) | |
| download | emacs-81e55fa6c37d51845b50ae22a935185cd441e99b.tar.gz emacs-81e55fa6c37d51845b50ae22a935185cd441e99b.tar.bz2 emacs-81e55fa6c37d51845b50ae22a935185cd441e99b.zip | |
Fix build problem with previous facemenu change
* lisp/facemenu.el (facemenu-add-face-function): Move to avoid a
warning.
(list-colors-display): Autoload.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/facemenu.el | 4 | ||||
| -rw-r--r-- | lisp/loadup.el | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lisp/facemenu.el b/lisp/facemenu.el index dc5f8f46aba..6290b02add2 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -85,10 +85,6 @@ ;;; Code: -;; Global bindings: -(define-key global-map [C-down-mouse-2] 'facemenu-menu) -(define-key global-map "\M-o" 'facemenu-keymap) - (defgroup facemenu nil "Create a face menu for interactively adding fonts to text." :group 'faces diff --git a/lisp/loadup.el b/lisp/loadup.el index 3ee8bed1842..c91c00a1075 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -253,6 +253,7 @@ (load "startup") (load "term/tty-colors") (load "font-core") +(load "facemenu") (load "emacs-lisp/syntax") (load "font-lock") (load "jit-lock") @@ -491,7 +492,9 @@ lost after dumping"))) (defun facemenu-keymap-restore () "Restore the facemenu keymap." - (require 'facemenu) + ;; Global bindings: + (define-key global-map [C-down-mouse-2] 'facemenu-menu) + (define-key global-map "\M-o" 'facemenu-keymap) (define-key facemenu-keymap "\eS" 'center-paragraph) (define-key facemenu-keymap "\es" 'center-line)) |