Mercurial > emacs
diff lisp/font-lock.el @ 83405:1955a4462bf9
Merged from miles@gnu.org--gnu-2005 (patch 659-663)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-660
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-661
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-662
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-663
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-445
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 03 Dec 2005 14:25:50 +0000 |
| parents | 03335deca80b ef8e06ff56b9 |
| children | 37d0562504bf |
line wrap: on
line diff
--- a/lisp/font-lock.el Wed Nov 23 01:35:21 2005 +0000 +++ b/lisp/font-lock.el Sat Dec 03 14:25:50 2005 +0000 @@ -1123,8 +1123,9 @@ (font-lock-fontify-region (point) (mark))) ((error quit) (message "Fontifying block...%s" error-data))))))) -(if (boundp 'facemenu-keymap) - (define-key facemenu-keymap "\M-o" 'font-lock-fontify-block)) +(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.