diff options
| author | Glenn Morris | 2014-02-22 13:20:49 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-02-22 13:20:49 -0800 |
| commit | 612c3e462e40e8ee347276500d8bc7371655e607 (patch) | |
| tree | 02b44d9503a258c101ba8ea7ab5bcabaae6a2cec | |
| parent | 123c84f91bf9206bff013ab7366068b8a16ed687 (diff) | |
| download | emacs-612c3e462e40e8ee347276500d8bc7371655e607.tar.gz emacs-612c3e462e40e8ee347276500d8bc7371655e607.zip | |
* lisp/imenu.el (imenu--generic-function): Doc fix.
* etc/NEWS: Related markup.
| -rw-r--r-- | etc/NEWS | 1 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/imenu.el | 8 |
3 files changed, 9 insertions, 2 deletions
| @@ -704,6 +704,7 @@ the symbol found near point. | |||
| 704 | *** New option `hi-lock-auto-select-face'. When non-nil, hi-lock commands | 704 | *** New option `hi-lock-auto-select-face'. When non-nil, hi-lock commands |
| 705 | will cycle through faces in `hi-lock-face-defaults' without prompting. | 705 | will cycle through faces in `hi-lock-face-defaults' without prompting. |
| 706 | 706 | ||
| 707 | --- | ||
| 707 | ** New Imenu option `imenu-generic-skip-comments-and-strings'. | 708 | ** New Imenu option `imenu-generic-skip-comments-and-strings'. |
| 708 | 709 | ||
| 709 | ** Info | 710 | ** Info |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47a582750fb..8ebb68622f5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-02-22 Glenn Morris <rgm@gnu.org> | 1 | 2014-02-22 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * imenu.el (imenu--generic-function): Doc fix. | ||
| 4 | |||
| 3 | * register.el (frame-configuration-to-register): Make obsolete. | 5 | * register.el (frame-configuration-to-register): Make obsolete. |
| 4 | 6 | ||
| 5 | 2014-02-22 Juanma Barranquero <lekktu@gmail.com> | 7 | 2014-02-22 Juanma Barranquero <lekktu@gmail.com> |
diff --git a/lisp/imenu.el b/lisp/imenu.el index 9f11ef45e75..e5f33a5efb9 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el | |||
| @@ -726,8 +726,12 @@ for modes which use `imenu--generic-function'. If it is not set, but | |||
| 726 | ;; so it needs to be careful never to loop! | 726 | ;; so it needs to be careful never to loop! |
| 727 | (defun imenu--generic-function (patterns) | 727 | (defun imenu--generic-function (patterns) |
| 728 | "Return an index alist of the current buffer based on PATTERNS. | 728 | "Return an index alist of the current buffer based on PATTERNS. |
| 729 | PATTERNS should be an alist which has the same form as | 729 | PATTERNS should be an alist with the same form as `imenu-generic-expression'. |
| 730 | `imenu-generic-expression'. | 730 | |
| 731 | If `imenu-generic-skip-comments-and-strings' is non-nil, this ignores | ||
| 732 | text inside comments and strings. | ||
| 733 | |||
| 734 | If `imenu-case-fold-search' is non-nil, this ignores case. | ||
| 731 | 735 | ||
| 732 | The return value is an alist of the form | 736 | The return value is an alist of the form |
| 733 | (INDEX-NAME . INDEX-POSITION) | 737 | (INDEX-NAME . INDEX-POSITION) |