Merge from origin/emacs-26

008b263 (origin/emacs-26, emacs-26) * lisp/gnus/gnus.el: Mark autoloa...
daf32f1 Speed up redisplay of HELLO
d8a6d82 Improve documentation of 'safe-local-variable' property

# Conflicts:
#	etc/HELLO

1 files changed, 5 insertions, 0 deletions

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 932b7c829b9..5e1bfbd7145 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1847,6 +1847,11 @@ variables have @code{safe-local-variable} properties; these include
 For boolean-valued variables that are safe, use @code{booleanp} as the
 property value.
 
+  If you want to define @code{safe-local-variable} properties for
+variables defined in C source code, add the names and the properties
+of those variables to the list in the ``Safe local variables'' section
+of @file{files.el}.
+
 @cindex autoload cookie, and safe values of variable
   When defining a user option using @code{defcustom}, you can set its
 @code{safe-local-variable} property by adding the arguments