[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/drupal-mode 07eaf83729 015/308: New var drupal-root. Use i
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/drupal-mode 07eaf83729 015/308: New var drupal-root. Use it for `tags-file-name'. |
Date: |
Tue, 25 Jan 2022 10:59:03 -0500 (EST) |
branch: elpa/drupal-mode
commit 07eaf837295d61c60bc6e220de56caafa2ec700c
Author: Arne Jørgensen <arne@arnested.dk>
Commit: Arne Jørgensen <arne@arnested.dk>
New var drupal-root. Use it for `tags-file-name'.
---
drupal-mode.el | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drupal-mode.el b/drupal-mode.el
index c8e4534298..ed9ac15514 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -82,6 +82,10 @@ According to http://drupal.org/coding-standards#indenting."
(make-variable-buffer-local 'drupal-version)
(put 'drupal-version 'safe-local-variable 'string-or-null-p)
+(defvar drupal-root nil "Drupal project root as auto detected.")
+(make-variable-buffer-local 'drupal-root)
+(put 'drupal-root 'safe-local-variable 'string-or-null-p)
+
(defvar drupal-mode-map
(let ((map (make-sparse-keymap)))
(define-key map "\C-cdf" 'drupal-search-documentation)
@@ -102,6 +106,12 @@ According to http://drupal.org/coding-standards#indenting."
(c-add-language 'drupal-mode 'c-mode)
(c-set-style "drupal"))
+ ;; setup TAGS file for etags if it exists in DRUPAL_ROOT
+ (when (and (boundp 'drupal-root)
+ (file-exists-p (concat drupal-root "TAGS")))
+ (setq tags-file-name (concat drupal-root "TAGS")))
+
+ ;; handle line ending and trailing whitespace
(add-hook 'before-save-hook 'drupal-convert-line-ending)
(add-hook 'before-save-hook 'drupal-delete-trailing-whitespace))
@@ -204,7 +214,8 @@ should save your files with unix style end of line."
(save-excursion
(goto-char (point-min))
(when (re-search-forward "\\(define('VERSION',\\|const
VERSION =\\) +'\\(.+\\)'" nil t)
- (dir-locals-set-class-variables 'drupal-class `((nil .
((drupal-version . ,(match-string-no-properties 2))))))
+ (dir-locals-set-class-variables 'drupal-class `((nil .
((drupal-version . ,(match-string-no-properties 2))
+
(drupal-root . ,dir)))))
(dir-locals-set-directory-class dir 'drupal-class)))
(setq drupal-version (match-string-no-properties 2))
)))
- [nongnu] branch elpa/drupal-mode created (now 17927723ad), ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 90446f5bd8 003/308: Merge branch 'release/0.1.0', ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 07eaf83729 015/308: New var drupal-root. Use it for `tags-file-name'.,
ELPA Syncer <=
- [nongnu] elpa/drupal-mode 50fb7ad1f9 007/308: Add api.drupalcontrib.org for doc search., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 571f94535f 011/308: Added 'elpa-install' target., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 3f20a5b31b 008/308: Improve drupal-style indentation for comments., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 00fa57745f 005/308: Cleanup., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode b7f50ec381 012/308: Detecting version shouldn't fail on non-files., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode bcde7079ab 021/308: Moved etags support to its own file., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode c1385212f4 018/308: Add basic drush support., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode db24ec6bf9 023/308: Added gtags support to drupal-mode., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 8828357fe8 031/308: Stripped section heading lines in plain ascii., ELPA Syncer, 2022/01/25
- [nongnu] elpa/drupal-mode 35c9e17240 037/308: Rewrote Makefile., ELPA Syncer, 2022/01/25