summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-07-06 12:52:12 -0700
committerGlenn Morris <rgm@gnu.org>2019-07-06 12:52:12 -0700
commitd8732a82451fea57d6efa43e704e0c693e11b517 (patch)
tree7abe0bd16fa581fb9101a1eb67b29ba4030d9eaa /lisp
parent206a9b4be7ba6ab0b0204d1ef7ab86389f766c8a (diff)
parent1e6d8e003ce28f508e26eb7107ce5bd0e20bb4b8 (diff)
downloademacs-d8732a82451fea57d6efa43e704e0c693e11b517.tar.gz
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
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/ada-mode.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 404e704373e..4a4e1a7aad4 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -7,6 +7,7 @@
;; Emmanuel Briot <briot@gnat.com>
;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
;; Keywords: languages ada
+;; Version: 4.0
;; This file is part of GNU Emacs.