[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/progmodes cc-mode.el
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] emacs/lisp/progmodes cc-mode.el |
Date: |
Sat, 18 Jul 2009 20:42:55 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Alan Mackenzie <acmacm> 09/07/18 20:42:55
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&r1=1.84&r2=1.85
Patches:
Index: cc-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-mode.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- cc-mode.el 19 May 2009 22:35:07 -0000 1.84
+++ cc-mode.el 18 Jul 2009 20:42:55 -0000 1.85
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp/progmodes cc-mode.el,
Alan Mackenzie <=