diff lisp/packages/fontl-hooks.el @ 10:49a24b4fd526 r19-15b6

Import from CVS: tag r19-15b6
author cvs
date Mon, 13 Aug 2007 08:47:52 +0200
parents b82b59fe008d
children 131b0175ea99
line wrap: on
line diff
--- a/lisp/packages/fontl-hooks.el	Mon Aug 13 08:47:36 2007 +0200
+++ b/lisp/packages/fontl-hooks.el	Mon Aug 13 08:47:52 2007 +0200
@@ -72,15 +72,15 @@
 that is allowable as a value for `font-lock-defaults' and will be
 used to initialize the Font Lock variables."
 
-  (if (not (featurep 'font-lock))
-      nil
-    (if (or (and font-lock-auto-fontify
-		 (not (memq major-mode font-lock-mode-disable-list)))
-	    (and (not font-lock-auto-fontify)
-		 (memq major-mode font-lock-mode-enable-list)))
-	(if (and (font-lock-set-defaults-1 explicit-defaults)
-		 font-lock-keywords)
-	    (turn-on-font-lock)))))
+  (when
+      (and
+       (featurep 'font-lock)
+       (if font-lock-auto-fontify
+	   (not (memq major-mode font-lock-mode-disable-list))
+	 (memq major-mode font-lock-mode-enable-list))
+       (font-lock-set-defaults-1 explicit-defaults)
+       font-lock-keywords)
+    (turn-on-font-lock)))
 
 (provide 'fontl-hooks)