diff options
| author | Andreas Politz | 2013-11-29 05:38:20 +0200 |
|---|---|---|
| committer | Dmitry Gutov | 2013-11-29 05:38:20 +0200 |
| commit | c8f0efc2e89d9cfc7befa7f20f584f3f0b12f487 (patch) | |
| tree | 8228024ce4c340f381c5db9bf3501877443071fd /doc/lispref | |
| parent | bd15d9d1ad961157afa3a16bc1ceb11be64e46f1 (diff) | |
| download | emacs-c8f0efc2e89d9cfc7befa7f20f584f3f0b12f487.tar.gz emacs-c8f0efc2e89d9cfc7befa7f20f584f3f0b12f487.zip | |
* doc/lispref/modes.texi (Imenu): Make it clear that sub-alist is the cdr.
* lisp/imenu.el (imenu--subalist-p): Don't error on non-conses and
allow non-lambda lists as functions.
(imenu--in-alist): Don't recurse into non-subalists.
(imenu): Don't pass function itself as an argument.
Fixes: debbugs:14029
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index ba7fe63a1b5..59e61bbdc74 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-11-29 Andreas Politz <politza@fh-trier.de> | ||
| 2 | |||
| 3 | * modes.texi (Imenu): Make it clear that sub-alist is the cdr | ||
| 4 | (Bug#14029). | ||
| 5 | |||
| 1 | 2013-11-27 Glenn Morris <rgm@gnu.org> | 6 | 2013-11-27 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * loading.texi (Library Search): | 8 | * loading.texi (Library Search): |
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 180fef7241d..dc643bda9c8 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi | |||
| @@ -2483,7 +2483,7 @@ Selecting a special element performs: | |||
| 2483 | A nested sub-alist element looks like this: | 2483 | A nested sub-alist element looks like this: |
| 2484 | 2484 | ||
| 2485 | @example | 2485 | @example |
| 2486 | (@var{menu-title} @var{sub-alist}) | 2486 | (@var{menu-title} . @var{sub-alist}) |
| 2487 | @end example | 2487 | @end example |
| 2488 | 2488 | ||
| 2489 | It creates the submenu @var{menu-title} specified by @var{sub-alist}. | 2489 | It creates the submenu @var{menu-title} specified by @var{sub-alist}. |