Revert previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b6f51273a4e005387e8fb8d0b04bbe88748223c..5b067570e148d7e76bd1b3e96a14fc177a84ee1e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-19  Alan Mackenzie  <acm@muc.de>
+
+       * files.el (hack-local-variables-filter): Revert
+       yesterday's change.
+
+       * progmodes/cc-mode.el (c-before-hack-hook),
+       (c-postprocess-file-styles): Revert yesterday's changes.
+
 2009-07-18  Alan Mackenzie  <acm@muc.de>
 
        * progmodes/cc-mode.el (c-before-hack-hook),

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 8d7ac9241f6c4a7e3d8fc27ea34839a5bd606337..dbdb2e7cc45360d9ee99d16b155a93362f920ec6 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -670,7 +670,7 @@ This function is called from the hook `before-hack-local-variables-hook'."
          (offsets (cdr (assq 'c-file-offsets file-local-variables-alist))))
       (when stile
        (or (stringp stile) (error "c-file-style is not a string"))
-       (c-set-style stile t))
+       (c-set-style stile))
       (when offsets
        (mapc
         (lambda (langentry)
@@ -741,7 +741,7 @@ Note that the style variables are always made local to the buffer."
     (when c-file-style
       (or (stringp c-file-style)
          (error "c-file-style is not a string"))
-      (c-set-style c-file-style t))
+      (c-set-style c-file-style))
 
     (and c-file-offsets
         (mapc