diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2015-12-25 23:32:55 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2015-12-25 23:36:45 +0100 |
| commit | 490dcf2ae3f05baf201a451e701bc08d227ddc29 (patch) | |
| tree | 08e2e46d73975c3332285dab4fc4ee8bb9f70bb5 /lisp/net/browse-url.el | |
| parent | ba82d68819f2bc2b666f548fb76825f13b093dfa (diff) | |
| download | emacs-490dcf2ae3f05baf201a451e701bc08d227ddc29.tar.gz emacs-490dcf2ae3f05baf201a451e701bc08d227ddc29.tar.bz2 emacs-490dcf2ae3f05baf201a451e701bc08d227ddc29.zip | |
Don't treat /foo/bar:mumble as ange-ftp address
* lisp/net/browse-url.el (browse-url-filename-alist): Match colons
only in the first component. (bug#5362)
Diffstat (limited to 'lisp/net/browse-url.el')
| -rw-r--r-- | lisp/net/browse-url.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 757e368317a..feb0788db92 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -419,11 +419,11 @@ commands reverses the effect of this variable." :group 'browse-url) (defcustom browse-url-filename-alist - `(("^/\\(ftp@\\|anonymous@\\)?\\([^:]+\\):/*" . "ftp://\\2/") + `(("^/\\(ftp@\\|anonymous@\\)?\\([^:/]+\\):/*" . "ftp://\\2/") ;; The above loses the username to avoid the browser prompting for ;; it in anonymous cases. If it's not anonymous the next regexp ;; applies. - ("^/\\([^:@]+@\\)?\\([^:]+\\):/*" . "ftp://\\1\\2/") + ("^/\\([^:@/]+@\\)?\\([^:/]+\\):/*" . "ftp://\\1\\2/") ,@(if (memq system-type '(windows-nt ms-dos)) '(("^\\([a-zA-Z]:\\)[\\/]" . "file:///\\1/") ("^[\\/][\\/]+" . "file://"))) @@ -441,13 +441,13 @@ address to an HTTP URL: (setq browse-url-filename-alist \\='((\"/webmaster@webserver:/home/www/html/\" . \"http://www.acme.co.uk/\") - (\"^/\\(ftp@\\|anonymous@\\)?\\([^:]+\\):/*\" . \"ftp://\\2/\") - (\"^/\\([^:@]+@\\)?\\([^:]+\\):/*\" . \"ftp://\\1\\2/\") + (\"^/\\(ftp@\\|anonymous@\\)?\\([^:/]+\\):/*\" . \"ftp://\\2/\") + (\"^/\\([^:@/]+@\\)?\\([^:/]+\\):/*\" . \"ftp://\\1\\2/\") (\"^/+\" . \"file:/\")))" :type '(repeat (cons :format "%v" (regexp :tag "Regexp") (string :tag "Replacement"))) - :version "23.1" + :version "25.1" :group 'browse-url) (defcustom browse-url-save-file nil |