From baa7f3de13241c665b8b2a5f6192acf2f15e8932 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 22 Sep 2009 08:44:16 +0000 Subject: [PATCH] * info.el (Info-try-follow-nearest-node): Use the URL extracted by `Info-get-token', instead of `browse-url-url-at-point'. (Bug#4508) --- lisp/ChangeLog | 5 +++++ lisp/info.el | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 880dd09a6c9..551497b17c2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-09-22 Juanma Barranquero + + * 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 * calendar/calendar.el (calendar-mode-map): Make mouse-1 and 3 clicks on diff --git a/lisp/info.el b/lisp/info.el index f859ecf5dfb..cfaf749ef8a 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -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 a string, it is the name to use for the new buffer." 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)) -- 2.39.5