(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'.

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index dbdb2e7cc45360d9ee99d16b155a93362f920ec6..8d7ac9241f6c4a7e3d8fc27ea34839a5bd606337 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))
+       (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