diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-07-07 09:27:44 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-07-07 09:27:44 -0700 |
| commit | d3e0fdc24f85de3b33de007b8e1ca24560559d9b (patch) | |
| tree | 751ecc26bd89a0b0d6b9b7a49f299c43fff0a445 /lisp/imenu.el | |
| parent | 77166e0da2d58f2f6436989b7059d913be5b3439 (diff) | |
| parent | a427de9c86ed31b1fd7599664b3fea0733e633ee (diff) | |
| download | emacs-d3e0fdc24f85de3b33de007b8e1ca24560559d9b.tar.gz | |
Merge from origin/emacs-26
a427de9 (origin/emacs-26) Fix bug #11732
3a04e15 Improve documentation of 'emacs-lock-mode'
9d6ca5a * lisp/imenu.el (imenu-generic-expression): Doc fix. (Bug#32...
fdd7e7d Improve indexing of 'eval-defun' in ELisp manual
10af989 Fix (length CIRCULAR) documentation
271d1f7 Tramp editorials
4abf94f Clarify and improve doc strings of 'eval-last-sexp' and friends
6cfc7a7 Automate upload of Emacs manuals to gnu.org
b73cde5 Fix MH-E mail composition with GNU Mailutils (SF#485)
0dce5e5 Speed up 'replace-buffer-contents' some more
00fdce0 * doc/emacs/docstyle.texi: Avoid messing up the html output.
Conflicts:
admin/make-tarball.txt
Diffstat (limited to 'lisp/imenu.el')
| -rw-r--r-- | lisp/imenu.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el index 7d4363993de..c0103dbc4c2 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -200,9 +200,9 @@ string (which specifies the title of a submenu into which the matches are put). REGEXP is a regular expression matching a definition construct which is to be displayed in the menu. REGEXP may also be a -function, called without arguments. It is expected to search -backwards. It must return true and set `match-data' if it finds -another element. +function of no arguments. If REGEXP is a function, it is +expected to search backwards, return non-nil if it finds a +definition construct, and set `match-data' for that construct. INDEX is an integer specifying which subexpression of REGEXP matches the definition's name; this subexpression is displayed as the menu item. |