aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-02 16:05:38 +0200
committerLars Magne Ingebrigtsen2011-07-02 16:05:38 +0200
commit48e96771eb42027798fdb698f907147d008c9ed7 (patch)
tree6d18b398f916e7899805d2276b4bf3183ad5cc97
parent5cf561436035503121d771d123368b75ae1452b4 (diff)
downloademacs-48e96771eb42027798fdb698f907147d008c9ed7.tar.gz
emacs-48e96771eb42027798fdb698f907147d008c9ed7.zip
* info-look.el (info-lookup-add-help): Clarify that ARGS is a list
of keyword/argument pairs (bug#6904).
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/info-look.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05b54ce491a..cf520f5d21b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * info-look.el (info-lookup-add-help): Clarify that ARGS is a list
4 of keyword/argument pairs (bug#6904).
5
3 * replace.el (multi-occur): Mention 6 * replace.el (multi-occur): Mention
4 `multi-occur-in-matching-buffers' in the doc string (bug#7566). 7 `multi-occur-in-matching-buffers' in the doc string (bug#7566).
5 8
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 2cfaa81d4c7..13edc0269dd 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -127,9 +127,9 @@ OTHER-MODES is a list of cross references to other help modes.")
127 127
128(defun info-lookup-add-help (&rest arg) 128(defun info-lookup-add-help (&rest arg)
129 "Add or update a help specification. 129 "Add or update a help specification.
130Function arguments are one or more options of the form 130Function arguments are specified as keyword/argument pairs:
131 131
132 KEYWORD ARGUMENT 132 \(KEYWORD . ARGUMENT)
133 133
134KEYWORD is either `:topic', `:mode', `:regexp', `:ignore-case', 134KEYWORD is either `:topic', `:mode', `:regexp', `:ignore-case',
135 `:doc-spec', `:parse-rule', or `:other-modes'. 135 `:doc-spec', `:parse-rule', or `:other-modes'.