[Emacs-diffs] emacs/lisp/progmodes cc-mode.el [EMACS_23_1_RC]

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Alan Mackenzie <acmacm> 09/07/18 21:03:43

Modified files:
        lisp/progmodes : cc-mode.el 

Log message:
        (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'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/cc-mode.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.84&r2=1.84.2.1

Patches:
Index: cc-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-mode.el,v
retrieving revision 1.84
retrieving revision 1.84.2.1
diff -u -b -r1.84 -r1.84.2.1
--- cc-mode.el  19 May 2009 22:35:07 -0000      1.84
+++ cc-mode.el  18 Jul 2009 21:03:43 -0000      1.84.2.1
@@ -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