[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/tramp c6e0674c4c: Tramp ELPA version 2.5.3.1 released
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/tramp c6e0674c4c: Tramp ELPA version 2.5.3.1 released |
|
Date: |
Sat, 30 Jul 2022 03:57:57 -0400 (EDT) |
branch: externals/tramp
commit c6e0674c4c8a0844a7555926a35e505ad4c1ff24
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Tramp ELPA version 2.5.3.1 released
---
README | 4 +--
test/tramp-tests.el | 12 ++++----
texi/tramp.texi | 13 +++++---
texi/trampver.texi | 2 +-
tramp-archive.el | 7 +++++
tramp-crypt.el | 86 ++++++++++++++++++++++++++---------------------------
tramp-gvfs.el | 4 +--
tramp.el | 12 ++++----
trampver.el | 8 ++---
9 files changed, 80 insertions(+), 68 deletions(-)
diff --git a/README b/README
index c86430ecb4..10c331710e 100644
--- a/README
+++ b/README
@@ -22,11 +22,11 @@ installed with, you must recompile the package:
* Remove all byte-compiled Tramp files
- $ rm -f ~/.emacs.d/elpa/tramp-2.5.3/tramp*.elc
+ $ rm -f ~/.emacs.d/elpa/tramp-2.5.3.1/tramp*.elc
* Start Emacs with Tramp's source files
- $ emacs -L ~/.emacs.d/elpa/tramp-2.5.3 -l tramp
+ $ emacs -L ~/.emacs.d/elpa/tramp-2.5.3.1 -l tramp
This should not give you the error.
diff --git a/test/tramp-tests.el b/test/tramp-tests.el
index 9071beedf2..cee3651f21 100644
--- a/test/tramp-tests.el
+++ b/test/tramp-tests.el
@@ -2291,8 +2291,8 @@ This checks also `file-name-as-directory',
`file-name-directory',
(should-not (file-exists-p tmp-name))
;; Trashing files doesn't work when `system-move-file-to-trash'
- ;; is defined (on MS Windows and macOS), and for crypted remote
- ;; files.
+ ;; is defined (on MS-Windows and macOS), and for encrypted
+ ;; remote files.
(unless (or (fboundp 'system-move-file-to-trash) (tramp--test-crypt-p))
(let ((trash-directory (tramp--test-make-temp-name 'local quoted))
(delete-by-moving-to-trash t))
@@ -2824,7 +2824,7 @@ This tests also `file-directory-p' and
`file-accessible-directory-p'."
;; Trashing directories works only since Emacs 27.1. It doesn't
;; work when `system-move-file-to-trash' is defined (on MS
- ;; Windows and macOS), for crypted remote directories and for
+ ;; Windows and macOS), for encrypted remote directories and for
;; ange-ftp.
(when (and (not (fboundp 'system-move-file-to-trash))
(not (tramp--test-crypt-p)) (not (tramp--test-ftp-p))
@@ -3099,8 +3099,8 @@ This tests also `file-directory-p' and
`file-accessible-directory-p'."
;; (this is performed by `dired'). If FULL is nil, it shows just
;; one file. So we refrain from testing.
(skip-unless (not (tramp--test-ange-ftp-p)))
- ;; `insert-directory' of crypted remote directories works only since
- ;; Emacs 27.1.
+ ;; `insert-directory' of encrypted remote directories works only
+ ;; since Emacs 27.1.
(skip-unless (or (not (tramp--test-crypt-p)) (tramp--test-emacs27-p)))
(dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
@@ -6290,7 +6290,7 @@ This is used in tests which we dont't want to tag
(string-match-p "[[:multibyte:]]" default-directory)))))
(defun tramp--test-crypt-p ()
- "Check, whether the remote directory is crypted."
+ "Check, whether the remote directory is encrypted."
(tramp-crypt-file-name-p tramp-test-temporary-file-directory))
(defun tramp--test-docker-p ()
diff --git a/texi/tramp.texi b/texi/tramp.texi
index c1530e82ec..d573dedac5 100644
--- a/texi/tramp.texi
+++ b/texi/tramp.texi
@@ -667,6 +667,11 @@ may be used in your init file:
(with-eval-after-load 'tramp (tramp-change-syntax 'simplified))
@end lisp
+@vindex enable-remote-dir-locals
+Changing other variables via directory-local variables on a remote
+directory must be enabled by setting @code{enable-remote-dir-locals}
+to non-@code{nil}, @xref{Directory Variables, , , emacs}.
+
@menu
* Connection types:: Types of connections to remote hosts.
@@ -2397,7 +2402,7 @@ example below:
@end lisp
@vindex password-word-equivalents
-This user option is, by default, initialised from
+This user option is, by default, initialized from
@code{password-word-equivalents} when @value{tramp} is loaded, and it
is usually more convenient to add new passphrases to that user option
instead of altering this user option.
@@ -5441,15 +5446,15 @@ The verbosity levels are
@*@indent @w{ 4} activities
@*@indent @w{ 5} internal
@*@indent @w{ 6} sent and received strings
-@*@indent @w{ 7} file caching
-@*@indent @w{ 8} connection properties
+@*@indent @w{ 7} connection properties
+@*@indent @w{ 8} file caching
@*@indent @w{ 9} test commands
@*@indent @w{10} traces (huge)
@*@indent @w{11} call traces (maintainer only)
With @code{tramp-verbose} greater than or equal to 4, messages are
also written to a @value{tramp} debug buffer. Such debug buffers are
-essential to bug and problem analyses. For @value{tramp} bug reports,
+essential to bug and problem analyzes. For @value{tramp} bug reports,
set the @code{tramp-verbose} level to 6 (@pxref{Bug Reports}).
The debug buffer is in
diff --git a/texi/trampver.texi b/texi/trampver.texi
index 580d9ba69e..aefc3acaa4 100644
--- a/texi/trampver.texi
+++ b/texi/trampver.texi
@@ -8,7 +8,7 @@
@c In the Tramp GIT, the version numbers are auto-frobbed from
@c tramp.el, and the bug report address is auto-frobbed from
@c configure.ac.
-@set trampver 2.5.3
+@set trampver 2.5.3.1
@set trampurl https://www.gnu.org/software/tramp/
@set tramp-bug-report-address tramp-devel@@gnu.org
@set emacsver 25.1
diff --git a/tramp-archive.el b/tramp-archive.el
index 4b649edaab..33348ca21e 100644
--- a/tramp-archive.el
+++ b/tramp-archive.el
@@ -339,6 +339,13 @@ arguments to pass to the OPERATION."
(tramp-archive-run-real-handler
#'file-directory-p (list archive)))
(tramp-archive-run-real-handler operation args)
+ ;; The default directory of the Tramp connection buffer
+ ;; cannot be accessed. (Bug#56628)
+ ;; FIXME: It is superfluous to set it every single loop.
+ ;; But there is no place to set it when creating the buffer.
+ (with-current-buffer
+ (tramp-get-buffer (tramp-archive-dissect-file-name filename))
+ (setq default-directory (file-name-as-directory archive)))
;; Now run the handler.
(let ((tramp-methods (cons `(,tramp-archive-method) tramp-methods))
(tramp-gvfs-methods tramp-archive-all-gvfs-methods)
diff --git a/tramp-crypt.el b/tramp-crypt.el
index 5028e48932..9588e6a1a8 100644
--- a/tramp-crypt.el
+++ b/tramp-crypt.el
@@ -23,50 +23,50 @@
;;; Commentary:
-;; Access functions for crypted remote files. It uses encfs to
+;; Access functions for encrypted remote files. It uses encfs to
;; encrypt / decrypt the files on a remote directory. A remote
-;; directory, which shall include crypted files, must be declared in
+;; directory where you wish files to be encrypted must be declared in
;; `tramp-crypt-directories' via command `tramp-crypt-add-directory'.
;; All files in that directory, including all subdirectories, are
-;; stored there encrypted. This includes file names and directory
+;; stored encrypted. This includes file names and directory
;; names.
;; This package is just responsible for the encryption part. Copying
-;; of the crypted files is still the responsibility of the remote file
-;; name handlers.
+;; of the encrypted files is still the responsibility of the remote
+;; file name handlers.
;; A password protected encfs configuration file is created the very
-;; first time you access a crypted remote directory. It is kept in
-;; your user directory "~/.emacs.d/" with the url-encoded directory
-;; name as part of the basename, and ".encfs6.xml" as suffix. Do not
-;; lose this file and the corresponding password; otherwise there is
-;; no way to decrypt your crypted files.
+;; first time you access an encrypted remote directory. It is kept in
+;; your user directory (usually "~/.emacs.d/") with the url-encoded
+;; directory name as part of the basename, and ".encfs6.xml" as
+;; suffix. Do not lose this file and the corresponding password;
+;; otherwise there is no way to decrypt your encrypted files.
;; If the user option `tramp-crypt-save-encfs-config-remote' is
;; non-nil (the default), the encfs configuration file ".encfs6.xml"
-;; is also kept in the crypted remote directory. It depends on you,
+;; is also kept in the encrypted remote directory. It depends on you,
;; whether you regard the password protection of this file as
-;; sufficient.
+;; sufficient security.
;; If you use a remote file name with a quoted localname part, this
;; localname and the corresponding file will not be encrypted/
-;; decrypted. For example, if you have a crypted remote directory
-;; "/nextcloud:user@host:/crypted_dir", the command
+;; decrypted. For example, if you have an encrypted remote directory
+;; "/nextcloud:user@host:/encrypted_dir", the command
;;
-;; C-x d /nextcloud:user@host:/crypted_dir
+;; C-x d /nextcloud:user@host:/encrypted_dir
;;
;; will show the directory listing with the plain file names, and the
;; command
;;
-;; C-x d /nextcloud:user@host:/:/crypted_dir
+;; C-x d /nextcloud:user@host:/:/encrypted_dir
;;
;; will show the directory with the encrypted file names, and visiting
-;; a file will show its crypted contents. However, it is highly
-;; discouraged to mix crypted and not crypted files in the same
+;; a file will show its encrypted contents. However, it is highly
+;; discouraged to mix encrypted and non-encrypted files in the same
;; directory.
-;; If a remote directory shall not include crypted files anymore, it
-;; must be indicated by the command `tramp-crypt-remove-directory'.
+;; To disable encryption for a particular remote directory, use the
+;; command `tramp-crypt-remove-directory'.
;;; Code:
@@ -78,7 +78,7 @@
(autoload 'text-property-search-forward "text-property-search")
(defconst tramp-crypt-method "crypt"
- "Method name for crypted remote directories.")
+ "Method name for encrypted remote directories.")
(defcustom tramp-crypt-encfs-program "encfs"
"Name of the encfs program."
@@ -96,7 +96,7 @@
"Configuration option for encfs.
This could be either \"--standard\" or \"--paranoia\". The file
name IV chaining mode mode will always be disabled when
-initializing a new crypted remote directory."
+initializing a new encrypted remote directory."
:group 'tramp
:version "28.1"
:type '(choice (const "--standard")
@@ -120,7 +120,7 @@ initializing a new crypted remote directory."
They are completed by \"M-x TAB\" only when encryption support is enabled."
(and tramp-crypt-enabled
;; `tramp-crypt-remove-directory' needs to be completed only in
- ;; case we have already crypted directories.
+ ;; case we have already encrypted directories.
(or (not (eq symbol #'tramp-crypt-remove-directory))
tramp-crypt-directories)))
@@ -129,21 +129,21 @@ They are completed by \"M-x TAB\" only when encryption
support is enabled."
"Encfs configuration file name.")
(defcustom tramp-crypt-save-encfs-config-remote t
- "Whether to keep the encfs configuration file in the crypted remote
directory."
+ "Whether to keep the encfs configuration file in the encrypted remote
directory."
:group 'tramp
:version "28.1"
:type 'boolean)
;;;###tramp-autoload
(defvar tramp-crypt-directories nil
- "List of crypted remote directories.")
+ "List of encrypted remote directories.")
;; It must be a `defsubst' in order to push the whole code into
;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading.
;;;###tramp-autoload
(defsubst tramp-crypt-file-name-p (name)
- "Return the crypted remote directory NAME belongs to.
-If NAME doesn't belong to a crypted remote directory, retun nil."
+ "Return the encrypted remote directory NAME belongs to.
+If NAME doesn't belong to an encrypted remote directory, return nil."
(catch 'crypt-file-name-p
(and tramp-crypt-enabled (stringp name)
(not (tramp-compat-file-name-quoted-p name))
@@ -240,7 +240,7 @@ If NAME doesn't belong to a crypted remote directory, retun
nil."
Operations not mentioned here will be handled by the default Emacs
primitives.")
(defsubst tramp-crypt-file-name-for-operation (operation &rest args)
- "Like `tramp-file-name-for-operation', but for crypted remote files."
+ "Like `tramp-file-name-for-operation', but for encrypted remote files."
(let ((tfnfo (apply #'tramp-file-name-for-operation operation args)))
;; `tramp-file-name-for-operation' returns already the first argument
;; if it is remote. So we check a possible second argument.
@@ -264,7 +264,7 @@ arguments to pass to the OPERATION."
;;;###tramp-autoload
(defun tramp-crypt-file-name-handler (operation &rest args)
- "Invoke the crypted remote file related OPERATION.
+ "Invoke the encrypted remote file related OPERATION.
First arg specifies the OPERATION, second arg is a list of
arguments to pass to the OPERATION."
(if-let ((filename
@@ -409,7 +409,7 @@ ARGS are the arguments. It returns t if ran successful,
and nil otherwise."
t))))
(defun tramp-crypt-do-encrypt-or-decrypt-file-name (op name)
- "Return encrypted / decrypted NAME if NAME belongs to a crypted directory.
+ "Return encrypted / decrypted NAME if NAME belongs to an encrypted directory.
OP must be `encrypt' or `decrypt'. Raise an error if this fails.
Otherwise, return NAME."
(if-let ((tramp-crypt-enabled t)
@@ -438,17 +438,17 @@ Otherwise, return NAME."
name))
(defsubst tramp-crypt-encrypt-file-name (name)
- "Return encrypted NAME if NAME belongs to a crypted directory.
+ "Return encrypted NAME if NAME belongs to an encrypted directory.
Otherwise, return NAME."
(tramp-crypt-do-encrypt-or-decrypt-file-name 'encrypt name))
(defsubst tramp-crypt-decrypt-file-name (name)
- "Return decrypted NAME if NAME belongs to a crypted directory.
+ "Return decrypted NAME if NAME belongs to an encrypted directory.
Otherwise, return NAME."
(tramp-crypt-do-encrypt-or-decrypt-file-name 'decrypt name))
(defun tramp-crypt-do-encrypt-or-decrypt-file (op root infile outfile)
- "Encrypt / decrypt file INFILE to OUTFILE according to crypted directory
ROOT.
+ "Encrypt / decrypt file INFILE to OUTFILE according to encrypted directory
ROOT.
Both files must be local files. OP must be `encrypt' or `decrypt'.
If OP ist `decrypt', the basename of INFILE must be an encrypted file name.
Raise an error if this fails."
@@ -470,12 +470,12 @@ Raise an error if this fails."
(write-region nil nil outfile)))))
(defsubst tramp-crypt-encrypt-file (root infile outfile)
- "Encrypt file INFILE to OUTFILE according to crypted directory ROOT.
+ "Encrypt file INFILE to OUTFILE according to encrypted directory ROOT.
See `tramp-crypt-do-encrypt-or-decrypt-file'."
(tramp-crypt-do-encrypt-or-decrypt-file 'encrypt root infile outfile))
(defsubst tramp-crypt-decrypt-file (root infile outfile)
- "Decrypt file INFILE to OUTFILE according to crypted directory ROOT.
+ "Decrypt file INFILE to OUTFILE according to encrypted directory ROOT.
See `tramp-crypt-do-encrypt-or-decrypt-file'."
(tramp-crypt-do-encrypt-or-decrypt-file 'decrypt root infile outfile))
@@ -537,10 +537,10 @@ localname."
(make-tramp-file-name
:method tramp-crypt-method :user (user-login-name)
:host (url-hexify-string dir))
- (tramp-user-error nil "Not a crypted remote directory: \"%s\"" name))))
+ (tramp-user-error nil "Not an encrypted remote directory: \"%s\""
name))))
(defun tramp-crypt-get-remote-dir (vec)
- "Return the name of the crypted remote directory to be used for encfs."
+ "Return the name of the encrypted remote directory to be used for encfs."
(url-unhex-string (tramp-file-name-host vec)))
@@ -606,7 +606,7 @@ absolute file names."
(with-tramp-progress-reporter
v 0 (format "%s %s to %s" msg-operation filename newname)
(if (and t1 t2 (string-equal t1 t2))
- ;; Both files are on the same crypted remote directory.
+ ;; Both files are on the same encrypted remote directory.
(let (tramp-crypt-enabled)
(if (eq op 'copy)
(copy-file
@@ -624,7 +624,7 @@ absolute file names."
(file-name-nondirectory encrypt-newname) tmpdir))
tramp-crypt-enabled)
(cond
- ;; Source and target file are on a crypted remote directory.
+ ;; Source and target file are on an encrypted remote directory.
((and t1 t2)
(if (eq op 'copy)
(copy-file
@@ -632,7 +632,7 @@ absolute file names."
keep-date preserve-uid-gid preserve-extended-attributes)
(rename-file
encrypt-filename encrypt-newname ok-if-already-exists)))
- ;; Source file is on a crypted remote directory.
+ ;; Source file is on an encrypted remote directory.
(t1
(if (eq op 'copy)
(copy-file
@@ -641,7 +641,7 @@ absolute file names."
(rename-file encrypt-filename tmpfile1 t))
(tramp-crypt-decrypt-file t1 tmpfile1 tmpfile2)
(rename-file tmpfile2 newname ok-if-already-exists))
- ;; Target file is on a crypted remote directory.
+ ;; Target file is on an encrypted remote directory.
(t2
(if (eq op 'copy)
(copy-file
@@ -677,7 +677,7 @@ absolute file names."
(list filename newname ok-if-already-exists keep-date
preserve-uid-gid preserve-extended-attributes))))
-;; Crypted files won't be trashed.
+;; Encrypted files won't be trashed.
(defun tramp-crypt-handle-delete-directory
(directory &optional recursive _trash)
"Like `delete-directory' for Tramp files."
@@ -686,7 +686,7 @@ absolute file names."
(let (tramp-crypt-enabled)
(delete-directory (tramp-crypt-encrypt-file-name directory) recursive))))
-;; Crypted files won't be trashed.
+;; Encrypted files won't be trashed.
(defun tramp-crypt-handle-delete-file (filename &optional _trash)
"Like `delete-file' for Tramp files."
(with-parsed-tramp-file-name (expand-file-name filename) nil
diff --git a/tramp-gvfs.el b/tramp-gvfs.el
index 4adc35bcb6..e0b786f015 100644
--- a/tramp-gvfs.el
+++ b/tramp-gvfs.el
@@ -87,7 +87,7 @@
;; For hostname completion, information is retrieved from the zeroconf
;; daemon (for the "afp", "dav", "davs", and "sftp" methods). The
;; zeroconf daemon is pre-configured to discover services in the
-;; "local" domain. If another domain shall be used for discovering
+;; "local" domain. If another domain should be used for discovering
;; services, the user option `tramp-gvfs-zeroconf-domain' can be set
;; accordingly.
@@ -949,7 +949,7 @@ The call will be traced by Tramp with trace level 6."
"Current Tramp file name to be used, as vector.
It is needed when D-Bus signals or errors arrive, because there
is no information where to trace the message.
-Globally, the value shall always be nil; it is bound where needed.")
+The global value will always be nil; it is bound where needed.")
(defun tramp-gvfs-dbus-event-error (event err)
"Called when a D-Bus error message arrives, see
`dbus-event-error-functions'."
diff --git a/tramp.el b/tramp.el
index 88715e3230..95d674911f 100644
--- a/tramp.el
+++ b/tramp.el
@@ -106,8 +106,8 @@ Any level x includes messages for all levels 1 .. x-1. The
levels are
4 activities
5 internal
6 sent and received strings
- 7 file caching
- 8 connection properties
+ 7 connection properties
+ 8 file caching
9 test commands
10 traces (huge)
11 call traces (maintainer only)."
@@ -612,7 +612,7 @@ This regexp must match both `tramp-initial-end-of-output'
and
"Regexp matching password-like prompts.
The regexp should match at end of buffer.
-This variable is, by default, initialised from
+This variable is, by default, initialized from
`password-word-equivalents' when Tramp is loaded, and it is
usually more convenient to add new passphrases to that variable
instead of altering this variable.
@@ -3818,7 +3818,7 @@ Let-bind it when necessary.")
;; When we shall insert only a part of the file, we
;; copy this part. This works only for the shell file
- ;; name handlers. It doesn't work for crypted files.
+ ;; name handlers. It doesn't work for encrypted files.
(when (and (or beg end)
(tramp-sh-file-name-handler-p v)
(null tramp-crypt-enabled))
@@ -3916,7 +3916,7 @@ Return nil when there is no lockfile."
(buffer-string))))))
(defvar tramp-lock-pid nil
- "A random nunber local for every connection.
+ "A random number local for every connection.
Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'.")
(defun tramp-get-lock-pid (file)
@@ -5439,7 +5439,7 @@ This handles also chrooted environments, which are not
regarded as local."
;; handlers. `tramp-local-host-p' is also called for "smb" and
;; alike, where it must fail.
(tramp-sh-file-name-handler-p vec)
- ;; Direct actions aren't possible for crypted directories.
+ ;; Direct actions aren't possible for encrypted directories.
(null tramp-crypt-enabled)
;; The local temp directory must be writable for the other user.
(file-writable-p
diff --git a/trampver.el b/trampver.el
index c1d58a45f4..6970fa89f3 100644
--- a/trampver.el
+++ b/trampver.el
@@ -7,7 +7,7 @@
;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
;; Package: tramp
-;; Version: 2.5.3
+;; Version: 2.5.3.1
;; Package-Requires: ((emacs "25.1"))
;; Package-Type: multi
;; URL: https://www.gnu.org/software/tramp/
@@ -40,7 +40,7 @@
;; ./configure" to change them.
;;;###tramp-autoload
-(defconst tramp-version "2.5.3"
+(defconst tramp-version "2.5.3.1"
"This version of Tramp.")
;;;###tramp-autoload
@@ -78,7 +78,7 @@
;; Check for Emacs version.
(let ((x (if (not (string-lessp emacs-version "25.1"))
"ok"
- (format "Tramp 2.5.3 is not fit for %s"
+ (format "Tramp 2.5.3.1 is not fit for %s"
(replace-regexp-in-string "\n" "" (emacs-version))))))
(unless (string-equal "ok" x) (error "%s" x)))
@@ -104,7 +104,7 @@
("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")
("2.3.5.26.3" . "26.3")
("2.4.3.27.1" . "27.1") ("2.4.5.27.2" . "27.2")
- ("2.5.2.28.1" . "28.1")))
+ ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2")))
(add-hook 'tramp-unload-hook
(lambda ()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/tramp c6e0674c4c: Tramp ELPA version 2.5.3.1 released,
ELPA Syncer <=