Fix build problem with previous facemenu change

* lisp/facemenu.el (facemenu-add-face-function): Move to avoid a
warning.
(list-colors-display): Autoload.

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index dc5f8f46abac18f40450111d06b882400d360dd0..6290b02add2914fcb368986eeee047ed5fe00f2a 100644 (file)
--- 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 3ee8bed1842418f198d00d0780c816eb2ebbfdf8..c91c00a1075227f002073ca3d31a03d2c1edc1de 100644 (file)
--- 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))
 \f