Mercurial > emacs
changeset 105142:e2af9a73da8d
* info.el (Info-try-follow-nearest-node): Use the URL extracted by
`Info-get-token', instead of `browse-url-url-at-point'. (Bug#4508)
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 22 Sep 2009 08:44:16 +0000 |
| parents | c9587468d637 |
| children | 1afcc0df808d |
| files | lisp/ChangeLog lisp/info.el |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Sep 22 07:37:58 2009 +0000 +++ b/lisp/ChangeLog Tue Sep 22 08:44:16 2009 +0000 @@ -1,3 +1,8 @@ +2009-09-22 Juanma Barranquero <lekktu@gmail.com> + + * info.el (Info-try-follow-nearest-node): Use the URL extracted by + `Info-get-token', instead of `browse-url-url-at-point'. (Bug#4508) + 2009-09-22 Glenn Morris <rgm@gnu.org> * calendar/calendar.el (calendar-mode-map): Make mouse-1 and 3 clicks on
--- a/lisp/info.el Tue Sep 22 07:37:58 2009 +0000 +++ b/lisp/info.el Tue Sep 22 08:44:16 2009 +0000 @@ -1,4 +1,4 @@ -;;; info.el --- info package for Emacs +;; info.el --- info package for Emacs ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 @@ -3518,9 +3518,10 @@ If FORK is non-nil, it is passed to `Info-goto-node'." (let (node) (cond - ((Info-get-token (point) "[hf]t?tps?://" "[hf]t?tps?://\\([^ \t\n\"`({<>})']+\\)") - (setq node t) - (browse-url (browse-url-url-at-point))) + ((setq node (Info-get-token (point) "[hf]t?tps?://" + "\\([hf]t?tps?://[^ \t\n\"`({<>})']+\\)")) + (browse-url node) + (setq node t)) ((setq node (Info-get-token (point) "\\*note[ \n\t]+" "\\*note[ \n\t]+\\([^:]*\\):\\(:\\|[ \n\t]*(\\)?")) (Info-follow-reference node fork))