[elpa] externals/csharp-mode 4babfff 265/459: Merge branch 'preproc-indentation'

[ELPA Syncer]

branch: externals/csharp-mode
commit 4babfff82d885b0913e3839aaa1051f35d9e65c1
Merge: 239527c 0481983
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: Jostein Kjønigsen <jost...@kjonigsen.net>

    Merge branch 'preproc-indentation'
---
 csharp-mode.el                  | 2 +-
 test-files/indentation-tests.cs | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/csharp-mode.el b/csharp-mode.el
index 06b62d8..e61b11e 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -2934,7 +2934,7 @@ Otherwise run `c-inside-bracelist-p'."
                                    (class-close           . 0)
                                    (class-open            . 0)
                                    (comment-intro         . c-lineup-comment)
-                                   (cpp-macro             . 0)
+                                   (cpp-macro             . [0])
                                    (cpp-macro-cont        . 
c-lineup-dont-change)
                                    (defun-block-intro     . +)
                                    (defun-close           . 0)
diff --git a/test-files/indentation-tests.cs b/test-files/indentation-tests.cs
index 199f936..11ac6db 100644
--- a/test-files/indentation-tests.cs
+++ b/test-files/indentation-tests.cs
@@ -188,3 +188,10 @@ namespace Boo
         }
     }
 }
+
+public class NestedPreProcessor
+{
+#if DEBUG
+    public static bool Debug = true;
+#endif
+}