branch: externals/csharp-mode
commit 9a1ddba44e3ea706630e8aae040bf745d4f5631a
Merge: 879beb4 b4b9d61
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: Jostein Kjønigsen <jost...@kjonigsen.net>
Merge branch 'jtbm37/master'
---
csharp-mode.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/csharp-mode.el b/csharp-mode.el
index 57e2552..6e620e5 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -1200,7 +1200,7 @@ Currently handled:
;; instead of create one.
(c-lang-defconst c-type-modifier-kwds
;; EMCA-344, S?
- csharp '("readonly" "const"))
+ csharp '("readonly" "const" "volatile"))
;; Tue, 20 Apr 2010 16:02
@@ -1873,8 +1873,8 @@ to the beginning of the prior namespace.
(list "field"
(concat bol
access-modifier-list "+"
- ;; fields can be readonly/const
- "\\(?:" (regexp-opt '("readonly" "const")) space "\\)?"
+ ;; fields can be readonly/const/volatile
+ "\\(?:" (regexp-opt '("readonly" "const" "volatile"))
space "\\)?"
return-type space
"\\("
generic-identifier
