From: Alan Mackenzie <acm@muc.de>
Date: Sat, 18 Jul 2009 20:42:55 +0000 (+0000)
Subject: (c-before-hack-hook, c-postprocess-file-styles): Give invocation of
X-Git-Tag: emacs-pretest-23.1.90~2117
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c82f92a0fdb3834d8a2bf690fa68ee34de46fcd1;p=emacs.git

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