diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-09-15 09:20:32 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-09-15 09:20:32 -0700 |
| commit | 9e79d59790809387707852e6d1b691d1bfbf2327 (patch) | |
| tree | b18125d7befbcdad78f2cafb805d0db45c030318 /lisp/imenu.el | |
| parent | ffbe561ee5acb0b9edc5f4c995c287fb2485c315 (diff) | |
| parent | e133b630625d6e5791c8b491c1cf3252cdb97080 (diff) | |
| download | emacs-9e79d59790809387707852e6d1b691d1bfbf2327.tar.gz emacs-9e79d59790809387707852e6d1b691d1bfbf2327.tar.bz2 emacs-9e79d59790809387707852e6d1b691d1bfbf2327.zip | |
Merge from origin/emacs-26
e133b63 (origin/emacs-26) Avoid adverse side effects of fixing bug#21824
cc8f334 Document changes called out in NEWS
20ecc52 ; * etc/NEWS: Document recent change in 'thing-at-point'.
1fc5283 ; INSTALL: Fix a typo in the last commit.
24f240d Tiny doc updates re yum/dnf etc
41c2d25 Remove unused variable
1e3b3fa Fix (thing-at-point 'list) regression (Bug#31772)
219893a Clarify meaning of '*'
41cdda2 * etc/PROBLEMS: Document Ubuntu 16.04 issue.
1c22f03 Increase default value for imenu-auto-rescan-maxout
ee84389 Improve recent change to ELisp manual
ff374e4 * doc/lispref/display.texi (SVG Images): Improve wording.
3a0caf6 * doc/lispref/display.texi (SVG Images): Fix a typo. (Bug#32...
Conflicts:
doc/lispref/lists.texi
etc/NEWS
Diffstat (limited to 'lisp/imenu.el')
| -rw-r--r-- | lisp/imenu.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el index 7285b105748..09d50daacc2 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -96,11 +96,11 @@ This might not yet be honored by all index-building functions." :type 'boolean :group 'imenu) -(defcustom imenu-auto-rescan-maxout 60000 - "Imenu auto-rescan is disabled in buffers larger than this size (in bytes). -This variable is buffer-local." +(defcustom imenu-auto-rescan-maxout 600000 + "Imenu auto-rescan is disabled in buffers larger than this size (in bytes)." :type 'integer - :group 'imenu) + :group 'imenu + :version "26.2") (defcustom imenu-use-popup-menu 'on-mouse "Use a popup menu rather than a minibuffer prompt. |