branch: externals/tramp
commit 19c6d5db811632969e43ec44793fb2eb550e196e
Author: Michael Albinus <michael.albi...@gmx.de>
Commit: Michael Albinus <michael.albi...@gmx.de>
Tramp ELPA version 2.7.1.3 released
---
README | 6 +++---
texi/tramp.texi | 2 ++
texi/trampver.texi | 2 +-
tramp-integration.el | 4 +++-
tramp.el | 11 ++++++++---
trampver.el | 6 +++---
6 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/README b/README
index 5f4eaf9c05..a073439314 100644
--- a/README
+++ b/README
@@ -32,11 +32,11 @@ Emacs 28 or older
• Remove all byte-compiled Tramp files
- $ rm -f ~/.emacs.d/elpa/tramp-2.7.1.2/tramp*.elc
+ $ rm -f ~/.emacs.d/elpa/tramp-2.7.1.3/tramp*.elc
• Start Emacs with Tramp's source files
- $ emacs -L ~/.emacs.d/elpa/tramp-2.7.1.2 -l tramp
+ $ emacs -L ~/.emacs.d/elpa/tramp-2.7.1.3 -l tramp
This should not give you the error.
@@ -50,7 +50,7 @@ Mitigation of a bug in Emacs 29.1
---------------------------------
Due to a bug in Emacs 29.1, you must apply the following change prior
-installation or upgrading Tramp 2.7.1.2 from GNU ELPA:
+installation or upgrading Tramp 2.7.1.3 from GNU ELPA:
(when (string-equal emacs-version "29.1")
(with-current-buffer
diff --git a/texi/tramp.texi b/texi/tramp.texi
index 7f1dd3854c..0a6127b25c 100644
--- a/texi/tramp.texi
+++ b/texi/tramp.texi
@@ -5942,6 +5942,8 @@ $ export EDITOR=/path/to/emacsclient.sh
@item
How to determine whether a buffer is remote?
+@findex file-remote-p
+@vindex default-directory
The buffer-local variable @code{default-directory} tells this. If the
form @code{(file-remote-p default-directory)} returns non-@code{nil},
the buffer is remote. See the optional arguments of
diff --git a/texi/trampver.texi b/texi/trampver.texi
index 9b37e196ea..22730b5490 100644
--- a/texi/trampver.texi
+++ b/texi/trampver.texi
@@ -7,7 +7,7 @@
@c In the Tramp GIT, the version number and the bug report address
@c are auto-frobbed from configure.ac.
-@set trampver 2.7.1.2
+@set trampver 2.7.1.3
@set trampurl https://www.gnu.org/software/tramp/
@set tramp-bug-report-address tramp-devel@@gnu.org
@set emacsver 27.1
diff --git a/tramp-integration.el b/tramp-integration.el
index 8d039c25ea..465b7dbbae 100644
--- a/tramp-integration.el
+++ b/tramp-integration.el
@@ -54,6 +54,7 @@
(defvar shortdoc--groups)
(defvar tramp-current-connection)
(defvar tramp-postfix-host-format)
+(defvar tramp-syntax)
(defvar tramp-use-connection-share)
;;; Fontification of `read-file-name':
@@ -277,7 +278,8 @@ NAME must be equal to `tramp-current-connection'."
(tramp--with-startup
(with-eval-after-load 'shortdoc
;; Some packages deactivate Tramp. They don't deserve a shortdoc entry
then.
- (when (file-remote-p "/ssh:user@host:/tmp/foo")
+ (when (and (file-remote-p "/ssh:user@host:/tmp/foo")
+ (eq tramp-syntax 'default))
(dolist (elem `((file-remote-p
:eval (file-remote-p "/ssh:user@host:/tmp/foo")
:eval (file-remote-p "/ssh:user@host:/tmp/foo" 'method)
diff --git a/tramp.el b/tramp.el
index 22b3ef8462..7aaf5ed557 100644
--- a/tramp.el
+++ b/tramp.el
@@ -681,12 +681,15 @@ The `sudo' program appears to insert a `^@' character
into the prompt."
(defcustom tramp-otp-password-prompt-regexp
(rx-to-string
`(: bol (* nonl)
- ;; JumpCloud.
- (group (| "Verification code"))
+ (group (|
+ ;; JumpCloud.
+ "Verification code"
+ ;; TACC HPC. <https://docs.tacc.utexas.edu/basics/mfa/>
+ "TACC Token Code"))
(* nonl) (any . ,tramp-compat-password-colon-equivalents) (* blank)))
"Regexp matching one-time password prompts.
The regexp should match at end of buffer."
- :version "29.2"
+ :version "30.2"
:type 'regexp)
(defcustom tramp-wrong-passwd-regexp
@@ -6014,6 +6017,8 @@ nil."
(let ((found (tramp-check-for-regexp proc regexp)))
(with-tramp-timeout (timeout)
(while (not found)
+ ;; This is needed to yield the CPU, otherwise we'll see 100% CPU load.
+ (sit-for 0)
(tramp-accept-process-output proc)
(unless (process-live-p proc)
(tramp-error-with-buffer
diff --git a/trampver.el b/trampver.el
index c43386a190..202f5212b2 100644
--- a/trampver.el
+++ b/trampver.el
@@ -7,7 +7,7 @@
;; Maintainer: Michael Albinus <michael.albi...@gmx.de>
;; Keywords: comm, processes
;; Package: tramp
-;; Version: 2.7.1.2
+;; Version: 2.7.1.3
;; Package-Requires: ((emacs "27.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.7.1.2"
+(defconst tramp-version "2.7.1.3"
"This version of Tramp.")
;;;###tramp-autoload
@@ -76,7 +76,7 @@
;; Check for Emacs version.
(let ((x (if (not (string-version-lessp emacs-version "27.1"))
"ok"
- (format "Tramp 2.7.1.2 is not fit for %s"
+ (format "Tramp 2.7.1.3 is not fit for %s"
(replace-regexp-in-string "\n" "" (emacs-version))))))
(unless (string-equal "ok" x) (error "%s" x)))
