From 947b893b371e9d2dbd026b6a44ceaa98b22a756f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= Date: Sun, 21 Aug 2016 22:17:30 +0200 Subject: [PATCH 1/2] 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 0458356..d61fc1f 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"))) From f9d5596a57090f382502b888ea6d5a986ca26445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= Date: Sun, 21 Aug 2016 22:23:14 +0200 Subject: [PATCH 2/2] Bump version number --- drupal-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal-mode.el b/drupal-mode.el index d61fc1f..091cd49 100644 --- a/drupal-mode.el +++ b/drupal-mode.el @@ -5,7 +5,7 @@ ;; Author: Arne Jørgensen ;; URL: https://github.com/arnested/drupal-mode ;; Created: January 17, 2012 -;; Version: 0.7.0 +;; Version: 0.7.1 ;; Package-Requires: ((php-mode "1.5.0")) ;; Keywords: programming, php, drupal