[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csharp-mode fb1f7d5 338/459: Don't duplicate values and
From: |
ELPA Syncer |
Subject: |
[elpa] externals/csharp-mode fb1f7d5 338/459: Don't duplicate values and remove unneeded test |
Date: |
Sun, 22 Aug 2021 13:59:56 -0400 (EDT) |
branch: externals/csharp-mode
commit fb1f7d57675df8c38bbf9cc3c99e0059c8b16d7f
Author: Theodor Thornhill <theo@thornhill.no>
Commit: Theodor Thornhill <theo@thornhill.no>
Don't duplicate values and remove unneeded test
We don't set the csharp style indentation the way we did before. As such
the
removed case messes with CC Mode internals, in that the default should be
"gnu",
or whatever CC Mode sets at any given point in time. However, csharp-mode
should pick the correct indentation style in other cases.
---
csharp-mode-tests.el | 20 ++++++++++----------
csharp-mode.el | 7 ++++---
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index 01eaa04..28f5984 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -322,29 +322,29 @@
(equal before adaptive-fill-regexp))))
(ert-deftest activating-mode-style-defaults-to-csharp ()
+ (with-temp-buffer
+ (csharp-mode)
+ (should
+ (equal "csharp" c-indentation-style)))
+
(let ((c-default-style "csharp"))
(with-temp-buffer
(csharp-mode)
(should
(equal "csharp" c-indentation-style))))
+
(let ((c-default-style '((csharp-mode . "csharp")
(java-mode . "java"))))
(with-temp-buffer
(csharp-mode)
(should
- (equal "csharp" c-indentation-style))))
- (let (c-default-style)
- (with-temp-buffer
- (csharp-mode)
- (should
(equal "csharp" c-indentation-style)))))
(ert-deftest inside-bracelist-test ()
- (let ((c-default-style "csharp"))
- (with-temp-buffer
- (csharp-mode)
- (insert "public class A { public void F() {")
- (call-interactively #'newline))))
+ (with-temp-buffer
+ (csharp-mode)
+ (insert "public class A { public void F() {")
+ (call-interactively #'newline)))
;;(ert-run-tests-interactively t)
;; (local-set-key (kbd "<f6>") '(lambda ()
diff --git a/csharp-mode.el b/csharp-mode.el
index 320a1fc..692db57 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -234,9 +234,10 @@
(substatement-open . 0)))))
(eval-and-compile
- (setq c-default-style
- (cons '(csharp-mode . "csharp")
- c-default-style)))
+ (unless (assoc 'csharp-mode c-default-style)
+ (setq c-default-style
+ (cons '(csharp-mode . "csharp")
+ c-default-style))))
(defun csharp--color-backwards (font-lock-face)
(let (id-end)
- [elpa] externals/csharp-mode d365498 307/459: Merge pull request #170 from josteink/compiler-fontifications, (continued)
- [elpa] externals/csharp-mode d365498 307/459: Merge pull request #170 from josteink/compiler-fontifications, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 72c1912 314/459: Name change of codedoc functions, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode ecc3f38 317/459: Add annotation-top-cont as a new syntax construct, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 51ab628 319/459: Update README.org, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode be5af57 322/459: Fix optional type suffix regex, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 217d3a7 324/459: Revert "Add nullable operator to concatenated identifiers", ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 97903a2 327/459: Merge pull request #179 from josteink/feature/compilation-mode-dotnetcore, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode c44989a 331/459: Merge pull request #183 from josteink/vscode-fontification, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 2697c95 332/459: Move bobp checking in one level, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode adc69a4 335/459: Merge pull request #187 from josteink/bugfix/185, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode fb1f7d5 338/459: Don't duplicate values and remove unneeded test,
ELPA Syncer <=
- [elpa] externals/csharp-mode fc6f94f 339/459: Handle "nameof" entirely in c-basic-matchers-after., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 77a7243 341/459: Finally adapt CC Mode namespace matcher function, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode eff5dec 345/459: Try improve compilation-mode support for dotnet test fails., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 605b0e0 346/459: Add configuration option to font-locking of codedoc tags, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 49ca95e 350/459: RIP Marmalade, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 73c27c7 353/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 6e7922d 354/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode a99e43c 356/459: Update build.yml, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 9f36ad6 361/459: RIP Travis, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 48b11cf 366/459: Fix issues with non-nested using-statements., ELPA Syncer, 2021/08/22