[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6028662 9/9: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 6028662 9/9: Merge from origin/emacs-26 |
Date: |
Sat, 1 Jun 2019 15:04:56 -0400 (EDT) |
branch: master
commit 602866264917f0772ceab356e3206a139719d2c5
Merge: 5fb3782 008b263
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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
---
doc/lispref/variables.texi | 5 +++++
etc/HELLO | 6 ++++++
lisp/files.el | 1 +
lisp/gnus/gnus.el | 10 +++++-----
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 932b7c8..5e1bfbd 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 a56a73b..1c4381c 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 287ad14..5bac49a 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 1c41e08..66e6c57 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
- [Emacs-diffs] master updated (1860b6d -> 6028662), Glenn Morris, 2019/06/01
- [Emacs-diffs] master c6f4f5d 4/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master cce8e42 2/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 5fb3782 8/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 2101b9d 3/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 7af7289 5/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 6028662 9/9: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master f17e0e9 6/9: ; Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 7e911d0 7/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01
- [Emacs-diffs] master 17a1dae 1/9: Merge from origin/emacs-26, Glenn Morris, 2019/06/01