Mercurial > emacs
changeset 92939:f0b6eb7a4cc3
* font-lock.el (featurep): Remove test, not useful anymore.
(facemenu-keymap): Move key binding ...
* facemenu.el (facemenu-keymap): ... here.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 14 Mar 2008 16:15:49 +0000 |
| parents | 89f7b102ea85 |
| children | 23d6a73f69ad |
| files | lisp/ChangeLog lisp/facemenu.el lisp/font-lock.el |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Mar 14 16:12:31 2008 +0000 +++ b/lisp/ChangeLog Fri Mar 14 16:15:49 2008 +0000 @@ -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.
--- a/lisp/facemenu.el Fri Mar 14 16:12:31 2008 +0000 +++ b/lisp/facemenu.el Fri Mar 14 16:15:49 2008 +0000 @@ -284,6 +284,7 @@ (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
--- a/lisp/font-lock.el Fri Mar 14 16:12:31 2008 +0000 +++ b/lisp/font-lock.el Fri Mar 14 16:15:49 2008 +0000 @@ -1281,10 +1281,6 @@ (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.