diff options
author | Kenichi Handa <handa@m17n.org> | 2011-07-07 08:28:00 +0900 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2011-07-07 08:28:00 +0900 |
commit | d2a0a50628933d3cdb09818eee2e17f55e22531f (patch) | |
tree | d19c8e71eb63eb6ccd204c2f36f406e4cf853154 /lisp/info.el | |
parent | c805dec0b5fa81b5c9f2b724e2ec12a17d723aca (diff) | |
parent | 354cf0ba0b20108c9776be1d868458893bc2cd54 (diff) | |
download | emacs-d2a0a50628933d3cdb09818eee2e17f55e22531f.tar.gz |
merge trunk
Diffstat (limited to 'lisp/info.el')
-rw-r--r-- | lisp/info.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/info.el b/lisp/info.el index bca41c29d0f..047a1b340a0 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -2092,7 +2092,7 @@ If SAME-FILE is non-nil, do not move to a different Info file." )) (defun Info-directory-toc-nodes (filename) - "Directory-specific implementation of `Info-directory-toc-nodes'." + "Directory-specific implementation of `Info-toc-nodes'." `(,filename ("Top" nil nil nil))) @@ -3281,7 +3281,6 @@ MATCHES is a list of index matches found by `Info-apropos-matches'.") "Collect STRING matches from all known Info files on your system. Return a list of matches where each element is in the format \((FILENAME INDEXTEXT NODENAME LINENUMBER))." - (interactive "sIndex apropos: ") (unless (string= string "") (let ((pattern (format "\n\\* +\\([^\n]*%s[^\n]*\\):[ \t]+\\([^\n]+\\)\\.\\(?:[ \t\n]*(line +\\([0-9]+\\))\\)?" (regexp-quote string))) |