* font-lock.el (featurep): Remove test, not useful anymore.

(facemenu-keymap): Move key binding ...
* facemenu.el (facemenu-keymap): ... here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eee071781aef1cc83381811f4dbca2b16a55fceb..263a0e4407ac32d5309a29d24704d40db7e5ac05 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * font-lock.el (featurep): Remove test, not useful anymore.
+       (facemenu-keymap): Move key binding ...
+       * facemenu.el (facemenu-keymap): ... here.
+
        * vc-bzr.el (vc-bzr-print-log): Insert a file marker.  Run the log
        for each file in the list.
        (vc-bzr-log-view-mode): Recognize the file marker.

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 5e95bfd26e72f71716226f3b7f34337c58043bbe..63ad704c8c488e4289ce1cfc4c00720ef193d178 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -284,6 +284,7 @@ it will remove any faces not explicitly in the list."
 (defvar facemenu-keymap
   (let ((map (make-sparse-keymap "Set face")))
     (define-key map "o" (cons (purecopy "Other...") 'facemenu-set-face))
+    (define-key map "\M-o" 'font-lock-fontify-block)
     map)
   "Keymap for face-changing commands.
 `Facemenu-update' fills in the keymap according to the bindings

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 244b1df434759355e011aa2de6db18daeffdd507..2ac858763082117cd147948f4a90e5bb5d1d416e 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1281,10 +1281,6 @@ delimit the region to fontify."
              (font-lock-fontify-region (point) (mark)))
          ((error quit) (message "Fontifying block...%s" error-data)))))))
 
-(unless (featurep 'facemenu)
-  (error "facemenu must be loaded before font-lock"))
-(define-key facemenu-keymap "\M-o" 'font-lock-fontify-block)
-
 ;;; End of Fontification functions.
 \f
 ;;; Additional text property functions.