summaryrefslogtreecommitdiff
path: root/lisp/info.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-12-16 01:29:26 +0000
committerMiles Bader <miles@gnu.org>2006-12-16 01:29:26 +0000
commit4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch)
tree2e22bd79984f0772c43e294babc07c1508ce95ce /lisp/info.el
parentb44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff)
parentc3342e8eb3eaf4560210fd030383a940640648f2 (diff)
downloademacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz
emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.bz2
emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.zip
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 545-562) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - erc-iswitchb: Temporarily enable iswitchb mode * gnus--rel--5.10 (patch 172-176) - Merge from emacs--devo--0 - Update from CVS - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'lisp/info.el')
-rw-r--r--lisp/info.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/info.el b/lisp/info.el
index ad62940f99a..8b0558d898e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2805,6 +2805,11 @@ Give an empty topic name to go to the Index node itself."
(kill-buffer Info-complete-menu-buffer)))))
(if (equal Info-current-file "dir")
(error "The Info directory node has no index; use m to select a manual"))
+ ;; Strip leading colon in topic; index format does not allow them.
+ (if (and (stringp topic)
+ (> (length topic) 0)
+ (= (aref topic 0) ?:))
+ (setq topic (substring topic 1)))
(let ((orignode Info-current-node)
(pattern (format "\n\\* +\\([^\n]*%s[^\n]*\\):[ \t]+\\([^\n]*\\)\\.\\(?:[ \t\n]*(line +\\([0-9]+\\))\\)?"
(regexp-quote topic)))