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

4 files changed, 17 insertions, 5 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
diff --git a/etc/HELLO b/etc/HELLO
index a56a73bc1d2..1c4381c3e27 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -123,5 +123,11 @@ along with GNU Emacs.  If not, see <<https://www.gnu.org/licenses/>.
 ;;; Local Variables:
 ;;; tab-width: 32
 ;;; bidi-display-reordering: t
+<<<<<<< HEAD
 ;;; coding: utf-8
 ;;; End:</x-charset>
+=======
+;;; coding: iso-2022-7bit
+;;; inhibit-compacting-font-caches: t
+;;; End:
+>>>>>>> 008b263
diff --git a/lisp/files.el b/lisp/files.el
index 287ad14aecf..5bac49a74e4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3298,6 +3298,7 @@ asking you for confirmation."
 	   (fill-column             . integerp)	;; C source code
 	   (indent-tabs-mode        . booleanp)	;; C source code
 	   (left-margin             . integerp)	;; C source code
+	   (inhibit-compacting-font-caches . booleanp) ;; C source code
 	   (no-update-autoloads     . booleanp)
 	   (lexical-binding	 . booleanp)	  ;; C source code
 	   (tab-width               . integerp)	  ;; C source code
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 1c41e081b76..66e6c57e66b 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2500,12 +2500,12 @@ are always t.")
      (let ((interactive (nth 1 (memq ':interactive package))))
        (mapcar
 	(lambda (function)
-	  (let (keymap)
+	  (let (type)
 	    (when (consp function)
-	      (setq keymap (car (memq 'keymap function)))
+	      (setq type (cadr function))
 	      (setq function (car function)))
 	    (unless (fboundp function)
-	      (autoload function (car package) nil interactive keymap))))
+	      (autoload function (car package) nil interactive type))))
 	(if (eq (nth 1 package) ':interactive)
 	    (nthcdr 3 package)
 	  (cdr package)))))
@@ -2617,8 +2617,8 @@ are always t.")
       gnus-list-of-unread-articles gnus-list-of-read-articles
       gnus-offer-save-summaries gnus-make-thread-indent-array
       gnus-summary-exit gnus-update-read-articles gnus-summary-last-subject
-      gnus-summary-skip-intangible gnus-summary-article-number
-      gnus-data-header gnus-data-find)
+      (gnus-summary-skip-intangible macro) (gnus-summary-article-number macro)
+      (gnus-data-header macro) (gnus-data-find macro))
      ("gnus-group" gnus-group-insert-group-line gnus-group-quit
       gnus-group-list-groups gnus-group-first-unread-group
       gnus-group-set-mode-line gnus-group-set-info gnus-group-save-newsrc