aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorGlenn Morris2020-01-03 07:50:15 -0800
committerGlenn Morris2020-01-03 07:50:15 -0800
commitfa7148fd5ac7c10c32a1cdcf57ade55bc3be8718 (patch)
tree18f9bc1b56ea13026d5b3f40bcd3be9d0f39d634 /doc/misc
parent2ab5bc323b374bb8385e8032db1ccd08ac36bb84 (diff)
parent06364316e0998d6906b8a42d54102c5de4a54990 (diff)
downloademacs-fa7148fd5ac7c10c32a1cdcf57ade55bc3be8718.tar.gz
emacs-fa7148fd5ac7c10c32a1cdcf57ade55bc3be8718.zip
Merge from origin/emacs-27
06364316e0 (origin/emacs-27) * lisp/net/tramp.el (tramp-file-local-na... d3884f50e0 Adapt commentary in Tramp persistency file 2d82f5a44e Change Tramp version to 2.4.3.27.1 09b65707cc ; * src/dispnew.c (adjust_glyph_matrix): Fix last change. 37f9182b68 Fix redisplay when mode-line-format changes mode-line's he... 1420906b81 * src/fileio.c (Fwrite_region): Improve the doc string. 01dfcb7c87 Fix removal of frame decorations on Windows (Bug#38705)
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/trampver.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 6ee69117387..478ec7037a8 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
8@c In the Tramp GIT, the version numbers are auto-frobbed from 8@c In the Tramp GIT, the version numbers are auto-frobbed from
9@c tramp.el, and the bug report address is auto-frobbed from 9@c tramp.el, and the bug report address is auto-frobbed from
10@c configure.ac. 10@c configure.ac.
11@set trampver 2.4.3 11@set trampver 2.4.3.27.1
12@set tramp-bug-report-address tramp-devel@@gnu.org 12@set tramp-bug-report-address tramp-devel@@gnu.org
13@set emacsver 24.4 13@set emacsver 24.4
14 14