[nongnu] elpa/drupal-mode 16632d6cf7 133/308: Fixed drush version detection for Drush 7.

[ELPA Syncer]

branch: elpa/drupal-mode
commit 16632d6cf70029567fb3ab7fd656083e42cfe62b
Author: Arne Jørgensen <arne@arnested.dk>
Commit: Arne Jørgensen <arne@arnested.dk>

    Fixed drush version detection for Drush 7.
    
    Drush 7 changed the default "--pipe" output format of drush core-status
    to JSON. Added "--format=list" and "--strict=0" to silence errors on
    drush versions not knowing about the "--format" option.
---
 drupal-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drupal-mode.el b/drupal-mode.el
index 27e91419cf..a2abca6a1e 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))