Mercurial > emacs
diff lisp/info.el @ 90066:fb79180b618d
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-719
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-732
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-733
Update from CVS: man/calc.texi: Fix some TeX definitions.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-734
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-75
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-76
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-77
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 14 Dec 2004 07:34:55 +0000 |
| parents | f2ebccfa87d4 92b24762a33f |
| children | cb67264d6096 |
line wrap: on
line diff
--- a/lisp/info.el Sat Dec 11 02:29:07 2004 +0000 +++ b/lisp/info.el Tue Dec 14 07:34:55 2004 +0000 @@ -86,7 +86,7 @@ :group 'info) (defface info-xref-visited - '((t :inherit info-xref) + '((default :inherit info-xref) (((class color) (background light)) :foreground "magenta4") (((class color) (background dark)) :foreground "magenta3")) ;"violet"? "Face for visited Info cross-references." @@ -2834,8 +2834,7 @@ "Follow a node reference near point. Return non-nil if successful." (let (node) (cond - ((and (Info-get-token (point) "[hf]t?tp://" "[hf]t?tp://\\([^ \t\n\"`({<>})']+\\)") - (or (featurep 'browse-url) (require 'browse-url nil t))) + ((Info-get-token (point) "[hf]t?tp://" "[hf]t?tp://\\([^ \t\n\"`({<>})']+\\)") (setq node t) (browse-url (browse-url-url-at-point))) ((setq node (Info-get-token (point) "\\*note[ \n\t]+"