From: Glenn Morris <rgm@gnu.org>
Date: Sat, 6 Jul 2019 19:52:12 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~2073
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8732a82451fea57d6efa43e704e0c693e11b517;p=emacs.git

Merge from origin/emacs-26

1e6d8e0 (origin/emacs-26) ; * doc/emacs/killing.texi (Secondary Selec...
e2344a7 * lisp/svg.el, lisp/progmodes/ada-mode.el: Fix bug#36360.
ff738ab Minor copyedit of "Font Lock" in user manual
faf99dc Improve description of image descriptors
21351cc ; * src/lread.c (Fread): Make the comment wording more accurate.
d176090 Improve documentation of secondary selections
8910fe1 * src/fns.c (Fmapconcat): Doc fix.  (Bug#36418)

# Conflicts:
#	lisp/svg.el
---

d8732a82451fea57d6efa43e704e0c693e11b517
diff --cc lisp/progmodes/ada-mode.el
index 404e704373e,c9aba0a50d1..4a4e1a7aad4
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@@ -2,11 -2,12 +2,12 @@@
  
  ;; Copyright (C) 1994-1995, 1997-2019 Free Software Foundation, Inc.
  
 -;; Author: Rolf Ebert      <ebert@inf.enst.fr>
 +;; Author: Rolf Ebert <ebert@inf.enst.fr>
  ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
  ;;      Emmanuel Briot  <briot@gnat.com>
 -;; Maintainer: Stephen Leake <stephen_leake@member.fsf.org>
 +;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
  ;; Keywords: languages ada
+ ;; Version: 4.0
  
  ;; This file is part of GNU Emacs.