branch: elpa/drupal-mode
commit a02e1dde00680ae8bd797ef16a26bfe3d57e7ff4
Merge: 9ee19e25a8 c3f2427b4a
Author: Arne Jørgensen <[email protected]>
Commit: Arne Jørgensen <[email protected]>
Merge pull request #72 from arnested/fix-phpcs-output-parsing
Fix phpcs output parsing
---
drupal/phpcs.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drupal/phpcs.el b/drupal/phpcs.el
index 723f9fa32f..4dd4cbbb90 100644
--- a/drupal/phpcs.el
+++ b/drupal/phpcs.el
@@ -1,6 +1,6 @@
;;; drupal/phpcs.el --- Drupal-mode common support for flymake-phpcs and
flycheck
-;; Copyright (C) 2012, 2013 Arne Jørgensen
+;; Copyright (C) 2012, 2013, 2016 Arne Jørgensen
;; Author: Arne Jørgensen <[email protected]>
@@ -34,7 +34,7 @@
;; command. Check for both.
(call-process (or (and (boundp
'flymake-phpcs-command) (executable-find flymake-phpcs-command))
(executable-find "phpcs")) nil (list t nil) nil "-i")))))
(when (string-match
- "\\(Drupal[^,
+ "\\(Drupal[^ ,
]*\\)"
standards)
(match-string-no-properties 1 standards))))
