[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/drupal-mode 947b893b37 274/308: Handle case where `c-defau
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/drupal-mode 947b893b37 274/308: Handle case where `c-default-style` is a string |
Date: |
Tue, 25 Jan 2022 10:59:57 -0500 (EST) |
branch: elpa/drupal-mode
commit 947b893b371e9d2dbd026b6a44ceaa98b22a756f
Author: Arne Jørgensen <arne@arnested.dk>
Commit: Arne Jørgensen <arne@arnested.dk>
Handle case where `c-default-style` is a string
Fixes #73.
---
drupal-mode.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drupal-mode.el b/drupal-mode.el
index 0458356ecf..d61fc1f339 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -347,7 +347,12 @@ According to
https://drupal.org/coding-standards#indenting."
:group 'drupal)
(c-add-style "drupal" drupal-style)
-(add-to-list 'c-default-style '(drupal-mode . "drupal"))
+
+(if (and
+ (boundp 'c-default-style)
+ (stringp c-default-style))
+ (setq c-default-style `((drupal-mode . "drupal") (other .
,c-default-style)))
+ (add-to-list 'c-default-style '(drupal-mode . "drupal")))
- [nongnu] elpa/drupal-mode 56ef6b550c 207/308: Silenced byte-compiler., (continued)
- [nongnu] elpa/drupal-mode 56ef6b550c 207/308: Silenced byte-compiler., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 08d1a815ba 208/308: Simplified., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 1627981c94 210/308: Added a `drupal-drush-php-eval`, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 936ca4afcd 219/308: Run flycheck phpcs checker in-place, so info file rules work properly., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 6f2b2174fc 233/308: Don't trigger drupal-mode in vendor dirs. Closes #57., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 5b5ab1fb42 235/308: Merge pull request #58 from arnested/ignore-vendor, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 46205ad74c 244/308: Merge branch 'release/0.6.0', ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode cf0364cbaf 248/308: Merge branch 'release/0.6.1', ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode d9745316b3 261/308: Merge pull request #62 from arnested/feature/helm-gtags-compatibility, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 0a23dc084a 266/308: Add autoinsert template for .api.php files, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 947b893b37 274/308: Handle case where `c-default-style` is a string,
ELPA Syncer <=
- [nongnu] elpa/drupal-mode f93cdfe1b2 278/308: Use proper indent for continuation lines, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 9d793aa112 286/308: Add support for gxref/xref, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode dc82e5430c 295/308: Handle .info.yml files, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode a1c77dca8b 300/308: Prefer HTTPS URLs wherever we can, ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 83ee02f80a 024/308: Renamed `drupal-root' to `drupal-rootdir'., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 4ef339db0a 045/308: Don't locate standard for each buffer., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 808d1f1768 080/308: Use `eldoc-mode' for function argument tips., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode ca7773df72 102/308: Added `drupal-mode-beginning-of-line' for .info files., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode f17e7088ca 107/308: Provide Drupal projects as webjump sites., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 043644e85d 109/308: Set correct comment style for inline comments., ELPA Syncer, 2022/01/25