X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb..cc39a9dba6e3633e67501eaf0361fb2f040cb064:/lisp/font-lock.el

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b7b617fcff..32fbb0608a 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1765,8 +1765,7 @@ variables directly.
 Note: This function will erase modifications done by
 `font-lock-add-keywords' or `font-lock-remove-keywords', but will
 preserve `hi-lock-mode' highlighting patterns."
-  (let ((hi-lock--inhibit-font-lock-hook t))
-    (font-lock-mode -1))
+  (font-lock-mode -1)
   (kill-local-variable 'font-lock-set-defaults)
   (font-lock-mode 1))
 
@@ -2242,7 +2241,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
 		"\\)\\)\\>"
 		;; Any whitespace and defined object.
 		"[ \t'\(]*"
-		"\\(setf[ \t]+\\sw+)\\|\\sw+\\)?")
+		"\\(setf[ \t]+\\sw+\\|\\sw+\\)?")
        (1 font-lock-keyword-face)
        (9 (cond ((match-beginning 3) font-lock-function-name-face)
 		((match-beginning 6) font-lock-variable-name-face)