[Emacs-diffs] emacs/lisp ChangeLog info.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/22 08:44:19

Modified files:
        lisp           : ChangeLog info.el 

Log message:
        * info.el (Info-try-follow-nearest-node): Use the URL extracted by
          `Info-get-token', instead of `browse-url-url-at-point'.  (Bug#4508)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16230&r2=1.16231
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/info.el?cvsroot=emacs&r1=1.564&r2=1.565

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16230
retrieving revision 1.16231
diff -u -b -r1.16230 -r1.16231
--- ChangeLog   22 Sep 2009 07:37:58 -0000      1.16230
+++ ChangeLog   22 Sep 2009 08:44:16 -0000      1.16231
@@ -1,3 +1,8 @@
+2009-09-22  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * calendar/calendar.el (calendar-mode-map): Make mouse-1 and 3 clicks on

Index: info.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/info.el,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -b -r1.564 -r1.565
--- info.el     2 Sep 2009 03:06:50 -0000       1.564
+++ info.el     22 Sep 2009 08:44:19 -0000      1.565
@@ -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))