branch: elpa/drupal-mode
commit 4bd52836b3f534bfec2653e5eee1532f01387c5a
Author: Arne Jørgensen <[email protected]>
Commit: Arne Jørgensen <[email protected]>

    Inherit drupal-style from php style.
    
    Closes #59.
---
 drupal-mode.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drupal-mode.el b/drupal-mode.el
index 125027c1e1..570b4537a5 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -333,16 +333,15 @@ function arguments.")
 
 ;; drupal style
 (defcustom drupal-style
-  '((c-basic-offset . 2)
+  '("php"
+    (c-basic-offset . 2)
     (fill-column . 80)
     (show-trailing-whitespace . t)
     (indent-tabs-mode . nil)
     (require-final-newline . t)
     (c-offsets-alist . ((arglist-close . 0)
                         (arglist-cont-nonempty . c-lineup-math)
-                        (arglist-intro . +)
-                        (case-label . +)
-                        (comment-intro . 0)))
+                        (arglist-intro . +)))
     (c-doc-comment-style . (php-mode . javadoc))
     (c-label-minimum-indentation . 1)
     (c-special-indent-hook . c-gnu-impose-minimum)

Reply via email to