From: Michael Albinus Date: Mon, 19 Jan 2009 06:52:50 +0000 (+0000) Subject: * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also X-Git-Tag: emacs-pretest-23.0.90~378 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e0b6e3b945b6c29929c4dfaf1584d61d51e5c233;p=emacs.git * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also IPv4 mapped IPv6 addresses. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1cb1ccc80a..8a0bb2412ac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-01-19 Michael Albinus + + * net/tramp.el (tramp-ipv6-regexp): The regexp shall cover also + IPv4 mapped IPv6 addresses. + 2009-01-18 Juanma Barranquero * textmodes/css-mode.el (css-backward-sexp): Stop once it reaches diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index b226f22ad98..5814810dd53 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1213,9 +1213,11 @@ Used in `tramp-make-tramp-file-name'.") "*Regexp matching left hand side of IPv6 addresses. Derived from `tramp-prefix-ipv6-format'.") -;; The following regexp is a bit sloppy. But it shall serve our purposes. +;; 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]+" + "\\(?:\\(?:[a-zA-Z0-9]+\\)?:\\)+[a-zA-Z0-9.]+" "*Regexp matching IPv6 addresses.") (defconst tramp-postfix-ipv6-format