From ef49d20fe8ce0d3381519b736d8167087b7ae57e Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 14 Mar 2008 16:15:49 +0000 Subject: [PATCH] * font-lock.el (featurep): Remove test, not useful anymore. (facemenu-keymap): Move key binding ... * facemenu.el (facemenu-keymap): ... here. --- lisp/ChangeLog | 4 ++++ lisp/facemenu.el | 1 + lisp/font-lock.el | 4 ---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eee071781ae..263a0e4407a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2008-03-14 Dan Nicolaescu + * 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 5e95bfd26e7..63ad704c8c4 100644 --- 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 244b1df4347..2ac85876308 100644 --- 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. ;;; Additional text property functions. -- 2.39.2