diff options
| author | Glenn Morris | 2008-09-25 07:45:35 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-09-25 07:45:35 +0000 |
| commit | 4dd7f3750f4f82be7e4f42bbe1e1ebe193da9d2c (patch) | |
| tree | ffb0ff35c1ba7f4f9063663b4ac81a11971bc386 | |
| parent | 4968291f3f4a32a3333095123a6d3793ee5a3d71 (diff) | |
| download | emacs-4dd7f3750f4f82be7e4f42bbe1e1ebe193da9d2c.tar.gz emacs-4dd7f3750f4f82be7e4f42bbe1e1ebe193da9d2c.zip | |
(ffap-fixup-url): Don't call url-normalize-url. (Bug#898)
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ffap.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a9159efe5e1..fae9ac0b5c9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-09-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ffap.el (ffap-fixup-url): Don't call url-normalize-url. (Bug#898) | ||
| 4 | |||
| 1 | 2008-09-25 Chong Yidong <cyd@stupidchicken.com> | 5 | 2008-09-25 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * vc.el (vc-mark-resolved): Move message here from | 7 | * vc.el (vc-mark-resolved): Move message here from |
diff --git a/lisp/ffap.el b/lisp/ffap.el index 5d9b628a2c2..72efcb33542 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el | |||
| @@ -633,8 +633,9 @@ Looks at `ffap-ftp-default-user', returns \"\" for \"localhost\"." | |||
| 633 | ((and ffap-url-unwrap-local (ffap-url-unwrap-local url))) | 633 | ((and ffap-url-unwrap-local (ffap-url-unwrap-local url))) |
| 634 | ((and ffap-url-unwrap-remote ffap-ftp-regexp | 634 | ((and ffap-url-unwrap-remote ffap-ftp-regexp |
| 635 | (ffap-url-unwrap-remote url))) | 635 | (ffap-url-unwrap-remote url))) |
| 636 | ((fboundp 'url-normalize-url) ; may autoload url (part of w3) | 636 | ;; All this seems to do is remove any trailing "#anchor" part (Bug#898). |
| 637 | (url-normalize-url url)) | 637 | ;;; ((fboundp 'url-normalize-url) ; may autoload url (part of w3) |
| 638 | ;;; (url-normalize-url url)) | ||
| 638 | (url))) | 639 | (url))) |
| 639 | 640 | ||
| 640 | 641 | ||