diff options
| author | Alan Mackenzie <acm@muc.de> | 2009-07-19 20:20:30 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2009-07-19 20:20:30 +0000 |
| commit | cfb9601380685daaae0e85c6b1636078aded8327 (patch) | |
| tree | 04abfc752da6982cd9a555a11d1f4ed8a2b03adb | |
| parent | d4c3b7a5ebabe8d09f9298abaf3a2a442b646cc5 (diff) | |
| download | emacs-cfb9601380685daaae0e85c6b1636078aded8327.tar.gz | |
Revert previous change.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b6f51273a4..5b067570e14 100644 --- 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 8d7ac9241f6..dbdb2e7cc45 100644 --- 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 |