From: Luc Teirlinck <teirllm@auburn.edu>
Date: Tue, 29 Nov 2005 05:03:21 +0000 (+0000)
Subject: Throw error if facemenu is not loaded to prevent accidental change of
X-Git-Tag: emacs-pretest-22.0.90~5605
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=407f5edd353e13f53ac82f9617f477352914008d;p=emacs.git

Throw error if facemenu is not loaded to prevent accidental change of
loading order in loadup.el.  (Suggested by RMS.)
---

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.