diff options
| author | Alan Mackenzie <acm@muc.de> | 2009-07-18 21:03:43 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2009-07-18 21:03:43 +0000 |
| commit | 2e74089635ceeac928d2675934907449ad570474 (patch) | |
| tree | 5565aa601251f6f43404d8eba282413614f6d7b4 | |
| parent | 4abec4e36855c4cdc5943ea6690d96df76214166 (diff) | |
| download | emacs-2e74089635ceeac928d2675934907449ad570474.tar.gz | |
(c-before-hack-hook, c-postprocess-file-styles): Give invocation of
`c-set-style' DONT-OVERRIDE parameter of t. Already set style variables will
thus not be overridden by style settings given by `c-file-syle'.
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index dbdb2e7cc45..8d7ac9241f6 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)) + (c-set-style stile t)) (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)) + (c-set-style c-file-style t)) (and c-file-offsets (mapc |