From aebe6592db7da893fcedb56a3fb4b66ce3de2057 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 27 Dec 2016 20:06:27 +0100 Subject: [PATCH] Release Tramp 2.3.1 * doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.3.1". * lisp/net/tramp.el (tramp-eshell-directory-change): Add it to `eshell-mode-hook' but `eshell-first-time-mode-hook'. * lisp/net/tramp-compat.el (tramp-compat-file-name-quoted-p) (tramp-compat-file-name-quote) (tramp-compat-file-name-unquote): Embed them in `eval-and-compile'. --- doc/misc/trampver.texi | 2 +- lisp/net/tramp-compat.el | 47 ++++++++++++++++++++-------------------- lisp/net/tramp.el | 4 ++-- lisp/net/trampver.el | 6 ++--- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 3101dc0de82..2677672444e 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -8,7 +8,7 @@ @c In the Tramp GIT, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.3.1-pre +@set trampver 2.3.1 @c Other flags from configuration @set instprefix /usr/local diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 9f1c64dd100..9b779a0566b 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -349,34 +349,35 @@ This is a string of ten letters or dashes as in ls -l." ;; `file-name-quoted-p', `file-name-quote' and `file-name-unquote' are ;; introduced in Emacs 26. -(if (fboundp 'file-name-quoted-p) - (defalias 'tramp-compat-file-name-quoted-p 'file-name-quoted-p) - (defsubst tramp-compat-file-name-quoted-p (name) - "Whether NAME is quoted with prefix \"/:\". +(eval-and-compile + (if (fboundp 'file-name-quoted-p) + (defalias 'tramp-compat-file-name-quoted-p 'file-name-quoted-p) + (defsubst tramp-compat-file-name-quoted-p (name) + "Whether NAME is quoted with prefix \"/:\". If NAME is a remote file name, check the local part of NAME." - (string-match "^/:" (or (file-remote-p name 'localname) name)))) + (string-match "^/:" (or (file-remote-p name 'localname) name)))) -(if (fboundp 'file-name-quote) - (defalias 'tramp-compat-file-name-quote 'file-name-quote) - (defsubst tramp-compat-file-name-quote (name) - "Add the quotation prefix \"/:\" to file NAME. + (if (fboundp 'file-name-quote) + (defalias 'tramp-compat-file-name-quote 'file-name-quote) + (defsubst tramp-compat-file-name-quote (name) + "Add the quotation prefix \"/:\" to file NAME. If NAME is a remote file name, the local part of NAME is quoted." - (concat - (file-remote-p name) "/:" (or (file-remote-p name 'localname) name)))) + (concat + (file-remote-p name) "/:" (or (file-remote-p name 'localname) name)))) -(if (fboundp 'file-name-unquote) - (defalias 'tramp-compat-file-name-unquote 'file-name-unquote) - (defsubst tramp-compat-file-name-unquote (name) - "Remove quotation prefix \"/:\" from file NAME. + (if (fboundp 'file-name-unquote) + (defalias 'tramp-compat-file-name-unquote 'file-name-unquote) + (defsubst tramp-compat-file-name-unquote (name) + "Remove quotation prefix \"/:\" from file NAME. If NAME is a remote file name, the local part of NAME is unquoted." - (save-match-data - (let ((localname (or (file-remote-p name 'localname) name))) - (when (tramp-compat-file-name-quoted-p localname) - (setq - localname - (replace-match - (if (= (length localname) 2) "/" "") nil t localname))) - (concat (file-remote-p name) localname))))) + (save-match-data + (let ((localname (or (file-remote-p name 'localname) name))) + (when (tramp-compat-file-name-quoted-p localname) + (setq + localname + (replace-match + (if (= (length localname) 2) "/" "") nil t localname))) + (concat (file-remote-p name) localname)))))) (provide 'tramp-compat) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 4103a6e76a8..7b5f71a754f 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4345,13 +4345,13 @@ Only works for Bourne-like shells." (eval-after-load "esh-util" '(progn - (add-hook 'eshell-first-time-mode-hook + (add-hook 'eshell-mode-hook 'tramp-eshell-directory-change) (add-hook 'eshell-directory-change-hook 'tramp-eshell-directory-change) (add-hook 'tramp-unload-hook (lambda () - (remove-hook 'eshell-first-time-mode-hook + (remove-hook 'eshell-mode-hook 'tramp-eshell-directory-change) (remove-hook 'eshell-directory-change-hook 'tramp-eshell-directory-change))))) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index fad7e7f77c1..1cdbe161d52 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -6,7 +6,7 @@ ;; Author: Kai Großjohann ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.3.1-pre +;; Version: 2.3.1 ;; This file is part of GNU Emacs. @@ -32,7 +32,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.3.1-pre" +(defconst tramp-version "2.3.1" "This version of Tramp.") ;;;###tramp-autoload @@ -54,7 +54,7 @@ ;; Check for Emacs version. (let ((x (if (>= emacs-major-version 23) "ok" - (format "Tramp 2.3.1-pre is not fit for %s" + (format "Tramp 2.3.1 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) -- 2.39.2