Mercurial > emacs

changeset 103966:e1f250fc8519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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'.
author Alan Mackenzie <acm@muc.de>
date Sat, 18 Jul 2009 20:42:55 +0000
parents 73a2130eb104
children e7050deb1cce
files lisp/progmodes/cc-mode.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/progmodes/cc-mode.el	Sat Jul 18 20:41:32 2009 +0000
+++ b/lisp/progmodes/cc-mode.el	Sat Jul 18 20:42:55 2009 +0000
@@ -670,7 +670,7 @@
 	  (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 @@
     (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