Commit 60286626 authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

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

# Conflicts:
#	etc/HELLO
parents 5fb3782e 008b263f
Pipeline #1860 failed with stage
in 3 seconds
......@@ -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
......@@ -123,5 +123,11 @@ along with GNU Emacs. If not, see <<>.
;;; 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
......@@ -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
......@@ -2500,12 +2500,12 @@ are always t.")
(let ((interactive (nth 1 (memq ':interactive package))))
(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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment