diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 | ||||
| -rw-r--r-- | lisp/net/goto-addr.el | 4 | ||||
| -rw-r--r-- | lisp/net/pop3.el | 8 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index f2ee8950494..428bf32947b 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -2728,7 +2728,7 @@ The main reason for this alist is to deal with file versions in VMS.") ;; seem to believe in the F-switch (if (or (and symlink (string-match "@\\'" file)) (and directory (string-match "/\\'" file)) - (and executable (string-match "*\\'" file)) + (and executable (string-match "\\*\\'" file)) (and socket (string-match "=\\'" file))) (setq file (substring file 0 -1))))) (puthash file (or symlink directory) tbl) diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el index 43659d2820e..c25d7873918 100644 --- a/lisp/net/goto-addr.el +++ b/lisp/net/goto-addr.el @@ -98,7 +98,7 @@ A value of t means there is no limit--fontify regardless of the size." (defvar goto-address-mail-regexp ;; Actually pretty much any char could appear in the username part. -stef - "[-a-zA-Z0-9=._+]+@\\([-a-zA-z0-9_]+\\.\\)+[a-zA-Z0-9]+" + "[-a-zA-Z0-9=._+]+@\\([-a-zA-Z0-9_]+\\.\\)+[a-zA-Z0-9]+" "A regular expression probably matching an e-mail address.") (defvar goto-address-url-regexp @@ -246,7 +246,7 @@ there, then load the URL at or before point." "Find e-mail address around or before point. Then search backwards to beginning of line for the start of an e-mail address. If no e-mail address found, return nil." - (re-search-backward "[^-_A-z0-9.@]" (line-beginning-position) 'lim) + (re-search-backward "[^-_A-Za-z0-9.@]" (line-beginning-position) 'lim) (if (or (looking-at goto-address-mail-regexp) ; already at start (and (re-search-forward goto-address-mail-regexp (line-end-position) 'lim) diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el index cd6a113bffe..599e2305f77 100644 --- a/lisp/net/pop3.el +++ b/lisp/net/pop3.el @@ -585,7 +585,7 @@ Return the response string if optional second argument is non-nil." (goto-char pop3-read-point) (if (looking-at "-ERR") (error "%s" (buffer-substring (point) (- match-end 2))) - (if (not (looking-at "+OK")) + (if (not (looking-at "\\+OK")) (progn (setq pop3-read-point match-end) nil) (setq pop3-read-point match-end) (if return @@ -684,14 +684,14 @@ If NOW, use that time instead." "Send USER information to POP3 server." (pop3-send-command process (format "USER %s" user)) (let ((response (pop3-read-response process t))) - (if (not (and response (string-match "+OK" response))) + (if (not (and response (string-match "\\+OK" response))) (error "USER %s not valid" user)))) (defun pop3-pass (process) "Send authentication information to the server." (pop3-send-command process (format "PASS %s" pop3-password)) (let ((response (pop3-read-response process t))) - (if (not (and response (string-match "+OK" response))) + (if (not (and response (string-match "\\+OK" response))) (pop3-quit process)))) (defun pop3-apop (process user) @@ -704,7 +704,7 @@ If NOW, use that time instead." (let ((hash (md5 (concat pop3-timestamp pass) nil nil 'binary))) (pop3-send-command process (format "APOP %s %s" user hash)) (let ((response (pop3-read-response process t))) - (if (not (and response (string-match "+OK" response))) + (if (not (and response (string-match "\\+OK" response))) (pop3-quit process))))) )) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 420a72d42ef..b35b36eac7d 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -870,7 +870,7 @@ Derived from `tramp-prefix-ipv6-format'.") ;; The following regexp is a bit sloppy. But it shall serve our ;; purposes. It covers also IPv4 mapped IPv6 addresses, like in ;; "::ffff:192.168.0.1". -(defconst tramp-ipv6-regexp "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+" +(defconst tramp-ipv6-regexp "\\(?:[a-zA-Z0-9]*:\\)+[a-zA-Z0-9.]+" "Regexp matching IPv6 addresses.") (defconst tramp-postfix-ipv6-format-alist @@ -2087,7 +2087,7 @@ Return the string with the replaced variables." (tramp-compat-funcall 'substitute-env-vars filename 'only-defined)) ;; We need an own implementation. (save-match-data - (let ((idx (string-match "$\\(\\w+\\)" filename))) + (let ((idx (string-match "\\$\\(\\w+\\)" filename))) ;; `$' is coded as `$$'. (when (and idx (or (zerop idx) (not (eq ?$ (aref filename (1- idx))))) |