branch: elpa/drupal-mode
commit 947b893b371e9d2dbd026b6a44ceaa98b22a756f
Author: Arne Jørgensen <[email protected]>
Commit: Arne Jørgensen <[email protected]>
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")))