(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'.
This commit is contained in:
parent
982cbcabc0
commit
c82f92a0fd
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue