diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-12-02 10:32:23 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-12-02 10:32:23 -0800 |
| commit | 4d66f9fe5eebd98f2483c9416620c096d245f549 (patch) | |
| tree | 179f789c34a5f4ac1e8263e95ae160aba6f00e4f /lisp/net/trampver.el | |
| parent | 2064cd4c9b60766f958a6dcffcaa810224ef2d7d (diff) | |
| parent | cc3ad9a3d1b278852336265e0505e82cc5453778 (diff) | |
| download | emacs-4d66f9fe5eebd98f2483c9416620c096d245f549.tar.gz | |
Merge from origin/emacs-26
cc3ad9a ; * CONTRIBUTE: Clarify rules for committing to release branc...
a89dbe2 * doc/misc/dbus.texi (Type Conversion): Fix typo. (Bug#33551)
03ee726 ; Add comment to `customize-package-emacs-version-alist'
bce1d1a Improve documentation of gdb-mi.el
Diffstat (limited to 'lisp/net/trampver.el')
| -rw-r--r-- | lisp/net/trampver.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index ebd581b5f5a..b8684da8cf3 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -69,7 +69,11 @@ (replace-regexp-in-string "\n" "" (emacs-version)))))) (unless (string-equal "ok" x) (error "%s" x))) -;; Tramp versions integrated into Emacs. +;; Tramp versions integrated into Emacs. If a user option declares a +;; `:package-version' which doesn't belong to an integrated Tramp +;; version, it must be added here as well (see `tramp-syntax', for +;; example). This can be checked by something like +;; (customize-changed "26.1") (add-to-list 'customize-package-emacs-version-alist '(Tramp ("2.0.55" . "22.1") ("2.0.57" . "22.2") ("2.0.58-pre" . "22.3") @@ -78,8 +82,8 @@ ("2.2.3-24.1" . "24.1") ("2.2.3-24.1" . "24.2") ("2.2.6-24.3" . "24.3") ("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5") ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2") - ("2.2.13.25.2" . "25.3") ("2.3.3" . "26.1") - ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2"))) + ("2.2.13.25.2" . "25.3") + ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2"))) (add-hook 'tramp-unload-hook (lambda () |