diff options
author | Glenn Morris <rgm@gnu.org> | 2019-05-22 10:18:51 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-05-22 10:18:51 -0700 |
commit | 5c21832ae866077874fb662e49c695a7850ec22c (patch) | |
tree | 2955309c3cbe881985426e6e1e41cb0d3d7a21ad /doc/lispref/variables.texi | |
parent | d99f0c6fb831da5cc5e4ca2661d660906f30625d (diff) | |
parent | b0da9151d880f7ae60367a4b3d3ef91209bbd06f (diff) | |
download | emacs-5c21832ae866077874fb662e49c695a7850ec22c.tar.gz |
Merge from origin/emacs-26
b0da915 (origin/emacs-26, emacs-26) Fix a typo in ELisp manual
400907b Add option to disable help completion autoloading (Bug#28607)
122ba16 Don't segfault on force-window-update of deleted window
015b12e Fix typo in ELisp manual
eadf044 Remove repeated function call in picture.el
1228a90 ; Fix mm-destroy-parts docstring typo
6cfd68d Fix Hideshow key binding typo in Emacs manual
Diffstat (limited to 'doc/lispref/variables.texi')
-rw-r--r-- | doc/lispref/variables.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index aca7d2f5e93..932b7c829b9 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -2009,7 +2009,7 @@ all files in those directories. The list in @var{variables} can be of one of the two forms: @code{(@var{major-mode} . @var{alist})} or @code{(@var{directory} . @var{list})}. With the first form, if the file's buffer turns on a mode that is derived from @var{major-mode}, -then the all the variables in the associated @var{alist} are applied; +then all the variables in the associated @var{alist} are applied; @var{alist} should be of the form @code{(@var{name} . @var{value})}. A special value @code{nil} for @var{major-mode} means the settings are applicable to any mode. In @var{alist}, you can use a special |