From 0b558b4acb8326c6f26fcde47ca85777716ae831 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 4 Oct 2017 11:48:37 +0200 Subject: [PATCH] * lisp/net/tramp.el (tramp-tramp-file-p): Use `string-match-p'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported by Clément Pit-Claudel . --- lisp/net/tramp.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index ac882abae54..c8b6e68f719 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1269,14 +1269,14 @@ entry does not exist, return nil." ;;;###tramp-autoload (defun tramp-tramp-file-p (name) "Return t if NAME is a string with Tramp file name syntax." - (save-match-data - (and (stringp name) - ;; No "/:" and "/c:". This is not covered by `tramp-file-name-regexp'. - (not (string-match - (if (memq system-type '(cygwin windows-nt)) - "^/[[:alpha:]]?:" "^/:") - name)) - (string-match tramp-file-name-regexp name)))) + (and (stringp name) + ;; No "/:" and "/c:". This is not covered by `tramp-file-name-regexp'. + (not (string-match-p + (if (memq system-type '(cygwin windows-nt)) + "^/[[:alpha:]]?:" "^/:") + name)) + (string-match-p tramp-file-name-regexp name) + t)) (defun tramp-find-method (method user host) "Return the right method string to use. -- 2.39.5