summaryrefslogtreecommitdiff
path: root/doc/lispref/variables.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-01-15 13:53:40 -0800
committerGlenn Morris <rgm@gnu.org>2018-01-15 13:53:40 -0800
commit400b72cb6e118b86d2e83cbfb45b829b231ec4f9 (patch)
tree6c4f2e559e952c273dd4a21f90e5308aa28b17d1 /doc/lispref/variables.texi
parent8491cbef1afa0e4088729bfd7476d82bc2f09bba (diff)
parent98e5fb9bf3b49bea82a4d3e38be20415bd7f7684 (diff)
downloademacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.tar.gz
emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.tar.bz2
emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.zip
Merge from origin/emacs-26
98e5fb9bf3 (origin/emacs-26) Remove incorrect documentation in comint.el 8ba5b85161 An overdue update of src/emacs-icon.h 155b211133 Minor copyedit in ELisp manual
Diffstat (limited to 'doc/lispref/variables.texi')
-rw-r--r--doc/lispref/variables.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 8f8e8302c45..e025d3fd10b 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1827,7 +1827,8 @@ predicate, like this:
@noindent
The safe value definitions specified with @code{autoload} are copied
-into the @file{loaddefs.el} file, and are known to Emacs since the
+into the package's autoloads file (@file{loaddefs.el} for most
+packages bundled with Emacs), and are known to Emacs since the
beginning of a session.
@defopt safe-local-variable-values