branch: elpa/drupal-mode
commit 2ad9decdb70dd6ad7e6c5525bf8bcb7b2eb2e733
Merge: bd22697642 16632d6cf7
Author: Arne Jørgensen <[email protected]>
Commit: Arne Jørgensen <[email protected]>
Merge branch 'develop' into pr/35
---
drupal-mode.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drupal-mode.el b/drupal-mode.el
index 08434cc5b5..52fda19759 100644
--- a/drupal-mode.el
+++ b/drupal-mode.el
@@ -132,7 +132,7 @@ Include path to the executable if it is not in your $PATH."
"[\n\r]" ""
(with-output-to-string
(with-current-buffer standard-output
- (call-process drupal-drush-program nil
(list t nil) nil "core-status" "drush-version" "--pipe")))))
+ (call-process drupal-drush-program nil
(list t nil) nil "core-status" "drush-version" "--pipe" "--format=list"
"--strict=0")))))
"Version number of the installed version Drush."
:type 'string
:link '(variable-link drupal-drush-program)
@@ -396,7 +396,7 @@ should save your files with unix style end of line."
(php-search-documentation))
((and drupal-drush-program (string-match "drush" (symbol-name symbol)))
(browse-url
- (format-spec drupal-drush-search-url `((?v .
,(replace-regexp-in-string "\\([0-9]+\.\\).*\\'" "\\1x" drupal-drush-version))
+ (format-spec drupal-drush-search-url `((?v .
,(replace-regexp-in-string "\\([0-9]+\.\\).*\\'" "\\1x"
(replace-regexp-in-string ".*-dev" "master" drupal-drush-version)))
(?s . ,symbol)))))
(t (browse-url
(format-spec drupal-search-url `((?v . ,(drupal-major-version
drupal-version))
