[elpa] externals/csharp-mode fff8cb1 053/459: Merge branch 'devel'

[ELPA Syncer]

branch: externals/csharp-mode
commit fff8cb12549066b00366f9daa145224d183d9f47
Merge: 7438762 1f11abf
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>

    Merge branch 'devel'
---
 .gitignore     |  4 +---
 csharp-mode.el | 59 ++++++++++++++++++++++++++++++----------------------------
 makefile       |  3 +--
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4922a7c..1dc8ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,4 @@ tramp
 *.elc
 
 # Packaging
-.cask
-
-
+.tmp
diff --git a/csharp-mode.el b/csharp-mode.el
index 4a07468..a71d4bf 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -316,6 +316,7 @@
 
 
 
+
 ;; These are only required at compile time to get the sources for the
 ;; language constants.  (The load of cc-fonts and the font-lock
 ;; related constants could additionally be put inside an
@@ -333,6 +334,34 @@
     (load "cc-langs" nil t)))
 
 (eval-and-compile
+  ;; ==================================================================
+  ;; constants used in this module
+  ;; ==================================================================
+
+  ;;(error (byte-compile-dest-file))
+  ;;(error (c-get-current-file))
+
+  (defconst csharp-aspnet-directive-re
+    "<%@.+?%>"
+    "Regex for matching directive blocks in ASP.NET files (.aspx, .ashx, 
.ascx)")
+
+
+  (defconst csharp-enum-decl-re
+    (concat
+     "\\<enum[ \t\n\r\f\v]+"
+     "\\([[:alpha:]_][[:alnum:]_]*\\)"
+     "[ \t\n\r\f\v]*"
+     "\\(:[ \t\n\r\f\v]*"
+     "\\("
+     (c-make-keywords-re nil
+                        (list "sbyte" "byte" "short" "ushort" "int" "uint" 
"long" "ulong"))
+     "\\)"
+     "\\)?")
+    "Regex that captures an enum declaration in C#"
+    )
+
+  ;; ==================================================================
+
   ;; Make our mode known to the language constant system.  Use Java
   ;; mode as the fallback for the constants we don't change here.
   ;; This needs to be done also at compile time since the language
@@ -347,33 +376,6 @@
 
 
 
-;; ==================================================================
-;; constants used in this module
-;; ==================================================================
-
-;;(error (byte-compile-dest-file))
-;;(error (c-get-current-file))
-
-(defconst csharp-aspnet-directive-re
-  "<%@.+?%>"
-  "Regex for matching directive blocks in ASP.NET files (.aspx, .ashx, .ascx)")
-
-
-(defconst csharp-enum-decl-re
-  (concat
-   "\\<enum[ \t\n\r\f\v]+"
-   "\\([[:alpha:]_][[:alnum:]_]*\\)"
-   "[ \t\n\r\f\v]*"
-   "\\(:[ \t\n\r\f\v]*"
-   "\\("
-   (c-make-keywords-re nil
-     (list "sbyte" "byte" "short" "ushort" "int" "uint" "long" "ulong"))
-   "\\)"
-   "\\)?")
-  "Regex that captures an enum declaration in C#"
-  )
-
-;; ==================================================================
 
 
 
@@ -1584,7 +1586,8 @@ comment at the start of cc-engine.el for more info."
 
 (c-lang-defconst c-other-kwds
   csharp '("sizeof" "typeof" "is" "as" "yield" "extern"
-           "where" "select" "in" "from"))
+           "where" "select" "in" "from" "let" "orderby" "ascending" 
"descending"
+          "await" "async" "var"))
 
 (c-lang-defconst c-overloadable-operators
   ;; EMCA-344, S14.2.1
diff --git a/makefile b/makefile
index 65d9f92..221962b 100644
--- a/makefile
+++ b/makefile
@@ -22,8 +22,7 @@ test:
 %.elc: %.el
        $(EMACS) -f batch-byte-compile $<
 
-#all: $(ELCS) test package
-all: test package
+all: $(ELCS) test package
 
 clean:
        rm -f ../$(PACKAGE_NAME).tar