Commit c82f92a0 authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

(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'.
parent 982cbcab
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment