[elpa] externals/csharp-mode 962478e 057/459: Merge branch 'devel'

[ELPA Syncer]

branch: externals/csharp-mode
commit 962478efbad4692486891b05f0e5f0e11ecf12b7
Merge: 1f2fc21 689dd8b
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>

    Merge branch 'devel'
---
 csharp-mode.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/csharp-mode.el b/csharp-mode.el
index 5aa6765..b29439a 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -4387,6 +4387,14 @@ Key bindings:
     ;; customized values for our language.
     (c-init-language-vars csharp-mode)
 
+    ;; Set style to c# style unless a file local variable or default
+    ;; style is found, in which case it should be set after
+    ;; calling `c-common-init' below.
+    (unless (or c-file-style
+                (stringp c-default-style)
+                (assq 'csharp-mode c-default-style))
+      (c-set-style "c#" t))
+    
     ;; `c-common-init' initializes most of the components of a CC Mode
     ;; buffer, including setup of the mode menu, font-lock, etc.
     ;; There's also a lower level routine `c-basic-common-init' that