master 81e55fa: Fix build problem with previous facemenu change

[Lars Ingebrigtsen]

branch: master
commit 81e55fa6c37d51845b50ae22a935185cd441e99b
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix build problem with previous facemenu change
    
    * lisp/facemenu.el (facemenu-add-face-function): Move to avoid a
    warning.
    (list-colors-display): Autoload.
---
 lisp/facemenu.el | 4 ----
 lisp/loadup.el   | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index dc5f8f4..6290b02 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 3ee8bed..c91c00a 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))