From: Glenn Morris <rgm@gnu.org>
Date: Sat, 1 Jun 2019 19:04:43 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~2736
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=602866264917f0772ceab356e3206a139719d2c5;p=emacs.git

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
---

602866264917f0772ceab356e3206a139719d2c5
diff --cc etc/HELLO
index a56a73bc1d2,f424a2ab8aa..1c4381c3e27
--- a/etc/HELLO
+++ b/etc/HELLO
@@@ -123,5 -95,6 +123,11 @@@ along with GNU Emacs.  If not, see <<ht
  ;;; 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