branch: elpa/php-mode
commit 472c44f9d63e57f167897b5abf5a29e9c2341380
Author: USAMI Kenta <[email protected]>
Commit: USAMI Kenta <[email protected]>
Use nonl instead of any in RX form
---
lisp/php-mode.el | 2 +-
lisp/php.el | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index afd512946f..d6537ab90f 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -102,7 +102,7 @@
(let ((tag (replace-regexp-in-string
(rx bos "v") ""
(shell-command-to-string "git describe --tags")))
- (pattern (rx (group (+ any)) eol)))
+ (pattern (rx (group (+ nonl)) eol)))
(if (string-match pattern tag)
(match-string 0 tag)
(error "Faild to obtain git tag"))))
diff --git a/lisp/php.el b/lisp/php.el
index ef46272c75..3124ced08b 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -327,7 +327,7 @@ which will be the name of the method."
(* (syntax whitespace))
"("
,@(when include-args
- '((* any) line-end))))))
+ '((* nonl) line-end))))))
(defun php-create-regexp-for-classlike (type)
"Accepts a `TYPE' of a `classlike' object as a string, such as
@@ -378,7 +378,7 @@ can be used to match against definitions for that
classlike."
(+ (or (syntax word) (syntax symbol)))
(* (syntax whitespace))
(? "=" (* (syntax whitespace))
- (repeat 0 40 any))))
+ (repeat 0 40 nonl))))
1)
("Functions"
,(rx line-start
@@ -389,7 +389,7 @@ can be used to match against definitions for that
classlike."
(+ (or (syntax word) (syntax symbol)))
(* (syntax whitespace))
"("
- (repeat 0 100 any)))
+ (repeat 0 100 nonl)))
1)
("Import"
,(rx line-start
@@ -397,7 +397,7 @@ can be used to match against definitions for that
classlike."
(group
"use"
(+ (syntax whitespace))
- (repeat 0 100 any)))
+ (repeat 0 100 nonl)))
1)
("Classes"
,(php-create-regexp-for-classlike
"\\(?:class\\|interface\\|trait\\|enum\\)") 0)
