diff options
| author | Glenn Morris | 2018-01-15 13:53:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-01-15 13:53:40 -0800 |
| commit | 400b72cb6e118b86d2e83cbfb45b829b231ec4f9 (patch) | |
| tree | 6c4f2e559e952c273dd4a21f90e5308aa28b17d1 /doc | |
| parent | 8491cbef1afa0e4088729bfd7476d82bc2f09bba (diff) | |
| parent | 98e5fb9bf3b49bea82a4d3e38be20415bd7f7684 (diff) | |
| download | emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.tar.gz 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')
| -rw-r--r-- | doc/lispref/variables.texi | 3 |
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: | |||
| 1827 | 1827 | ||
| 1828 | @noindent | 1828 | @noindent |
| 1829 | The safe value definitions specified with @code{autoload} are copied | 1829 | The safe value definitions specified with @code{autoload} are copied |
| 1830 | into the @file{loaddefs.el} file, and are known to Emacs since the | 1830 | into the package's autoloads file (@file{loaddefs.el} for most |
| 1831 | packages bundled with Emacs), and are known to Emacs since the | ||
| 1831 | beginning of a session. | 1832 | beginning of a session. |
| 1832 | 1833 | ||
| 1833 | @defopt safe-local-variable-values | 1834 | @defopt safe-local-variable-values |