aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2018-02-02 07:50:22 -0800
committerGlenn Morris2018-02-02 07:50:22 -0800
commita893a4db20e9a6cf6a03855d40d9b9dfd9c49139 (patch)
treedc27e36bb663ee054a33d99e5647c0d152e853d8 /lisp
parent8dd2edc70fe77e86d0b4a9928e7f5bcd2543947a (diff)
parent6f495abd0d65075714f92b0eb7f637d6f540edfa (diff)
downloademacs-a893a4db20e9a6cf6a03855d40d9b9dfd9c49139.tar.gz
emacs-a893a4db20e9a6cf6a03855d40d9b9dfd9c49139.zip
Merge from origin/emacs-26
6f495ab (origin/emacs-26) Another round of manual fixups 59344c4 * doc/lispref/customize.texi (Custom Themes): Clarify .el pre... 6386efc * doc/emacs/entering.texi (Entering Emacs): Another wording fix. e21f018 * doc/lispref/functions.texi (Inline Functions): Fix typo (Bu... 1c2fb04 * lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug... b90e91c Fix last change of @key markup f180075 * doc/emacs/entering.texi (Entering Emacs): Fix markup.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/imenu.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el
index b766d0e624c..f56e7b50396 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -224,8 +224,8 @@ If non-nil this pattern is passed to `imenu--generic-function' to
224create a buffer index. 224create a buffer index.
225 225
226For example, see the value of `fortran-imenu-generic-expression' 226For example, see the value of `fortran-imenu-generic-expression'
227used by `fortran-mode' with `imenu-syntax-alist' set locally to 227used by `fortran-mode' with `imenu-syntax-alist' set locally so that
228give the characters which normally have \"symbol\" syntax 228characters which normally have \"symbol\" syntax are considered to have
229\"word\" syntax during matching.") 229\"word\" syntax during matching.")
230;;;###autoload(put 'imenu-generic-expression 'risky-local-variable t) 230;;;###autoload(put 'imenu-generic-expression 'risky-local-variable t)
231 231