summaryrefslogtreecommitdiff
path: root/lisp/font-lock.el
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2005-11-29 05:03:21 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2005-11-29 05:03:21 +0000
commit407f5edd353e13f53ac82f9617f477352914008d (patch)
tree312ff360fa1cf86b1a197c5909bac9d5d337eafa /lisp/font-lock.el
parent846e22f8a877bc30365581447d91cd7de1e4645d (diff)
downloademacs-407f5edd353e13f53ac82f9617f477352914008d.tar.gz
Throw error if facemenu is not loaded to prevent accidental change of
loading order in loadup.el. (Suggested by RMS.)
Diffstat (limited to 'lisp/font-lock.el')
-rw-r--r--lisp/font-lock.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b3a4a80e04a..e14ee816473 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1123,8 +1123,9 @@ delimit the region to fontify."
(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.