diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-24 21:31:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-24 21:31:10 +0000 |
| commit | 7f4cdff500df350407927c45f0dbd61f209b0dcf (patch) | |
| tree | eae2cc3c8ccdfe8c0dc5f51879ca4b888e5dfecc /lisp/info.el | |
| parent | 3d04c12a9dd905fb8e13817efcc985a432e2427c (diff) | |
| parent | 9484f6c15c2250b0d69fc7d91a3590b064305224 (diff) | |
| download | emacs-7f4cdff500df350407927c45f0dbd61f209b0dcf.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 751-770)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.
- Merge from gnus--rel--5.10
* emacs--rel--22 (patch 18-25)
* gnus--rel--5.10 (patch 222-223)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-208
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/info.el b/lisp/info.el index 4d1e1d8e3e9..b67820ef93d 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -288,7 +288,7 @@ It doesn't contain directory names or file name extensions added by Info.") (defvar Info-current-subfile nil "Info subfile that is actually in the *info* buffer now. -nil if current Info file is not split into subfiles.") +It is nil if current Info file is not split into subfiles.") (defvar Info-current-node nil "Name of node that Info is now looking at, or nil.") @@ -4075,7 +4075,8 @@ the variable `Info-file-list-for-emacs'." ;; Fontify http and ftp references (goto-char (point-min)) (when not-fontified-p - (while (re-search-forward "[hf]t?tp://[^ \t\n\"`({<>})']+" nil t) + (while (re-search-forward "\\(https?\\|ftp\\)://[^ \t\n\"`({<>})']+" + nil t) (add-text-properties (match-beginning 0) (match-end 0) '(font-lock-face info-xref mouse-face highlight |