[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/tramp eaeda68: Tramp ELPA version 2.4.4.1 released
From: |
Michael Albinus |
Subject: |
[elpa] externals/tramp eaeda68: Tramp ELPA version 2.4.4.1 released |
Date: |
Wed, 29 Jul 2020 05:47:57 -0400 (EDT) |
branch: externals/tramp
commit eaeda68bdd7eb8c788c1830ba8641052b60abec4
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Tramp ELPA version 2.4.4.1 released
---
texi/tramp.texi | 9 ++--
texi/trampver.texi | 2 +-
tramp-gvfs.el | 4 ++
tramp-loaddefs.el | 2 +-
tramp-sh.el | 129 ++++++++++++++++++++++-------------------------------
tramp.el | 2 +-
tramp.info | 118 ++++++++++++++++++++++++------------------------
trampver.el | 4 +-
8 files changed, 127 insertions(+), 143 deletions(-)
diff --git a/texi/tramp.texi b/texi/tramp.texi
index d6560a4..037791b 100644
--- a/texi/tramp.texi
+++ b/texi/tramp.texi
@@ -1687,10 +1687,11 @@ Integration for LXD containers. A container is
accessed via
@item magit-tramp
@cindex method @option{git}
@cindex @option{git} method
-Browing git repositories with @code{magit}. A versioned file is accessed via
-@file{@trampfn{git,rev@@root-dir,/path/to/file}}. @samp{rev} is a git
-revision, and @samp{root-dir} is a virtual host name for the root
-directory, specified in @code{magit-tramp-hosts-alist}.
+Browsing git repositories with @code{magit}. A versioned file is
+accessed via @file{@trampfn{git,rev@@root-dir,/path/to/file}}.
+@samp{rev} is a git revision, and @samp{root-dir} is a virtual host
+name for the root directory, specified in
+@code{magit-tramp-hosts-alist}.
@item tramp-hdfs
@cindex method @option{hdfs}
diff --git a/texi/trampver.texi b/texi/trampver.texi
index 4220752..73c76d6 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.4.4
+@set trampver 2.4.4.1
@set tramp-bug-report-address tramp-devel@@gnu.org
@set emacsver 24.4
diff --git a/tramp-gvfs.el b/tramp-gvfs.el
index b6c709a..ddb535f 100644
--- a/tramp-gvfs.el
+++ b/tramp-gvfs.el
@@ -731,6 +731,10 @@ is no information where to trace the message.")
(tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err))))
(add-hook 'dbus-event-error-functions #'tramp-gvfs-dbus-event-error)
+(add-hook
+ 'tramp-gvfs-unload-hook
+ (lambda ()
+ (remove-hook 'dbus-event-error-functions #'tramp-gvfs-dbus-event-error)))
;; File name primitives.
diff --git a/tramp-loaddefs.el b/tramp-loaddefs.el
index 7e0ef9c..5d2e218 100644
--- a/tramp-loaddefs.el
+++ b/tramp-loaddefs.el
@@ -663,7 +663,7 @@ UU-encode the region between BEG and END.
;;;### (autoloads nil "trampver" "trampver.el" (0 0 0 0))
;;; Generated autoloads from trampver.el
-(defconst tramp-version "2.4.4" "\
+(defconst tramp-version "2.4.4.1" "\
This version of Tramp.")
(defconst tramp-bug-report-address "tramp-devel@gnu.org" "\
diff --git a/tramp-sh.el b/tramp-sh.el
index f32256d..e9e8065 100644
--- a/tramp-sh.el
+++ b/tramp-sh.el
@@ -4104,80 +4104,54 @@ file exists and nonzero exit status otherwise."
(defun tramp-open-shell (vec shell)
"Open shell SHELL."
+ ;; Find arguments for this shell.
(with-tramp-progress-reporter
vec 5 (format-message "Opening remote shell `%s'" shell)
- ;; Find arguments for this shell.
- (let ((extra-args (tramp-get-sh-extra-args shell))
- (p (tramp-get-connection-process vec)))
- ;; The readline library can disturb Tramp. For example, the
- ;; very recent version of libedit, the *BSD implementation of
- ;; readline, confuses Tramp. So we disable line editing. Since
- ;; $EDITRC is not supported on all target systems, we must move
- ;; ~/.editrc temporarily somewhere else. For bash and zsh we
- ;; have disabled this already during shell invocation, see
- ;; `tramp-sh-extra-args' (Bug#39399).
- ;; The shell prompt might not be set yet, so we must read any
- ;; prompt via `tramp-barf-if-no-shell-prompt'.
- (unless extra-args
- (tramp-send-command vec "rm -f ~/.editrc.tramp" t t)
- (tramp-barf-if-no-shell-prompt p 10 "Couldn't find remote shell prompt")
- (tramp-send-command
- vec "test -e ~/.editrc && mv -f ~/.editrc ~/.editrc.tramp" t t)
- (tramp-barf-if-no-shell-prompt p 10 "Couldn't find remote shell prompt")
- (tramp-send-command vec "echo 'edit off' >~/.editrc" t t)
- (tramp-barf-if-no-shell-prompt
- p 10 "Couldn't find remote shell prompt"))
- ;; It is useful to set the prompt in the following command
- ;; because some people have a setting for $PS1 which /bin/sh
- ;; doesn't know about and thus /bin/sh will display a strange
- ;; prompt. For example, if $PS1 has "${CWD}" in the value, then
- ;; ksh will display the current working directory but /bin/sh
- ;; will display a dollar sign. The following command line sets
- ;; $PS1 to a sane value, and works under Bourne-ish shells as
- ;; well as csh-like shells. We also unset the variable $ENV
- ;; because that is read by some sh implementations (eg, bash
- ;; when called as sh) on startup; this way, we avoid the startup
- ;; file clobbering $PS1. $PROMPT_COMMAND is another way to set
- ;; the prompt in /bin/bash, it must be discarded as well.
- ;; $HISTFILE is set according to `tramp-histfile-override'.
- ;; $TERM and $INSIDE_EMACS set here to ensure they have the
- ;; correct values when the shell starts, not just processes
- ;; run within the shell. (Which processes include our
- ;; initial probes to ensure the remote shell is usable.)
- (tramp-send-command
- vec (format
- (eval-when-compile
- (concat
- "exec env TERM='%s' INSIDE_EMACS='%s,tramp:%s' "
- "ENV=%s %s PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s %s"))
- tramp-terminal-type
- emacs-version tramp-version ; INSIDE_EMACS
- (or (getenv-internal "ENV" tramp-remote-process-environment) "")
- (if (stringp tramp-histfile-override)
- (format "HISTFILE=%s"
- (tramp-shell-quote-argument tramp-histfile-override))
- (if tramp-histfile-override
- "HISTFILE='' HISTFILESIZE=0 HISTSIZE=0"
- ""))
- (tramp-shell-quote-argument tramp-end-of-output)
- shell (or extra-args ""))
- t)
- ;; Reset ~/.editrc.
- (unless extra-args
- (tramp-send-command vec "rm -f ~/.editrc" t)
- (tramp-send-command
- vec "test -e ~/.editrc.tramp && mv -f ~/.editrc.tramp ~/.editrc" t))
- ;; Check proper HISTFILE setting. We give up when not working.
- (when (and (stringp tramp-histfile-override)
- (file-name-directory tramp-histfile-override))
- (tramp-barf-unless-okay
- vec
- (format
- "(cd %s)"
- (tramp-shell-quote-argument
- (file-name-directory tramp-histfile-override)))
- "`tramp-histfile-override' uses invalid file `%s'"
- tramp-histfile-override)))
+ ;; It is useful to set the prompt in the following command because
+ ;; some people have a setting for $PS1 which /bin/sh doesn't know
+ ;; about and thus /bin/sh will display a strange prompt. For
+ ;; example, if $PS1 has "${CWD}" in the value, then ksh will
+ ;; display the current working directory but /bin/sh will display
+ ;; a dollar sign. The following command line sets $PS1 to a sane
+ ;; value, and works under Bourne-ish shells as well as csh-like
+ ;; shells. We also unset the variable $ENV because that is read
+ ;; by some sh implementations (eg, bash when called as sh) on
+ ;; startup; this way, we avoid the startup file clobbering $PS1.
+ ;; $PROMPT_COMMAND is another way to set the prompt in /bin/bash,
+ ;; it must be discarded as well. $HISTFILE is set according to
+ ;; `tramp-histfile-override'. $TERM and $INSIDE_EMACS set here to
+ ;; ensure they have the correct values when the shell starts, not
+ ;; just processes run within the shell. (Which processes include
+ ;; our initial probes to ensure the remote shell is usable.)
+ (tramp-send-command
+ vec (format
+ (eval-when-compile
+ (concat
+ "exec env TERM='%s' INSIDE_EMACS='%s,tramp:%s' "
+ "ENV=%s %s PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s %s"))
+ tramp-terminal-type
+ emacs-version tramp-version ; INSIDE_EMACS
+ (or (getenv-internal "ENV" tramp-remote-process-environment) "")
+ (if (stringp tramp-histfile-override)
+ (format "HISTFILE=%s"
+ (tramp-shell-quote-argument tramp-histfile-override))
+ (if tramp-histfile-override
+ "HISTFILE='' HISTFILESIZE=0 HISTSIZE=0"
+ ""))
+ (tramp-shell-quote-argument tramp-end-of-output)
+ shell (or (tramp-get-sh-extra-args shell) ""))
+ t)
+ ;; Check proper HISTFILE setting. We give up when not working.
+ (when (and (stringp tramp-histfile-override)
+ (file-name-directory tramp-histfile-override))
+ (tramp-barf-unless-okay
+ vec
+ (format
+ "(cd %s)"
+ (tramp-shell-quote-argument
+ (file-name-directory tramp-histfile-override)))
+ "`tramp-histfile-override' uses invalid file `%s'"
+ tramp-histfile-override))
(tramp-set-connection-property
(tramp-get-connection-process vec) "remote-shell" shell)))
@@ -4248,9 +4222,16 @@ process to set up. VEC specifies the connection."
(let ((tramp-end-of-output tramp-initial-end-of-output)
(case-fold-search t))
(tramp-open-shell vec (tramp-get-method-parameter vec 'tramp-remote-shell))
+ (tramp-message vec 5 "Setting up remote shell environment")
+
+ ;; Disable line editing.
+ (tramp-send-command vec "set +o vi +o emacs" t)
+
+ ;; Dump option settings in the traces.
+ (when (>= tramp-verbose 9)
+ (tramp-send-command vec "set -o" t))
;; Disable echo expansion.
- (tramp-message vec 5 "Setting up remote shell environment")
(tramp-send-command
vec "stty -inlcr -onlcr -echo kill '^U' erase '^H'" t)
;; Check whether the echo has really been disabled. Some
@@ -4320,8 +4301,6 @@ process to set up. VEC specifies the connection."
(tramp-message
vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)))
- (tramp-send-command vec "set +o vi +o emacs" t)
-
;; Check whether the remote host suffers from buggy
;; `send-process-string'. This is known for FreeBSD (see comment
;; in `send_process', file process.c). I've tested sending 624
diff --git a/tramp.el b/tramp.el
index b61e443..495c40f 100644
--- a/tramp.el
+++ b/tramp.el
@@ -7,7 +7,7 @@
;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
;; Package: tramp
-;; Version: 2.4.4
+;; Version: 2.4.4.1
;; Package-Requires: ((emacs "24.4"))
;; Package-Type: multi
;; URL: https://savannah.gnu.org/projects/tramp
diff --git a/tramp.info b/tramp.info
index 1824b1f..c78cec0 100644
--- a/tramp.info
+++ b/tramp.info
@@ -21,10 +21,10 @@ END-INFO-DIR-ENTRY
File: tramp.info, Node: Top, Next: Overview, Prev: (dir), Up: (dir)
-TRAMP 2.4.4 User Manual
-***********************
+TRAMP 2.4.4.1 User Manual
+*************************
-This file documents TRAMP 2.4.4, a remote file editing package for
+This file documents TRAMP 2.4.4.1, a remote file editing package for
Emacs.
TRAMP stands for “Transparent Remote (file) Access, Multiple
@@ -1278,7 +1278,7 @@ They can be installed with Emacs’ Package Manager. This
includes
the same meaning as in ‘docker-tramp’.
‘magit-tramp’
- Browing git repositories with ‘magit’. A versioned file is
+ Browsing git repositories with ‘magit’. A versioned file is
accessed via ‘/git:rev@root-dir:/path/to/file’. ‘rev’ is a git
revision, and ‘root-dir’ is a virtual host name for the root
directory, specified in ‘magit-tramp-hosts-alist’.
@@ -4620,61 +4620,61 @@ Concept Index
Tag Table:
Node: Top933
-Node: Overview5415
-Node: Obtaining TRAMP10749
-Node: Quick Start Guide13196
-Ref: Quick Start Guide: File name syntax13973
-Ref: Quick Start Guide: ssh and plink methods15075
-Ref: Quick Start Guide: su, sudo and sg methods15619
-Ref: Quick Start Guide: ssh, plink, su, sudo and sg methods16183
-Ref: Quick Start Guide: sudoedit method16713
-Ref: Quick Start Guide: smb method17124
-Ref: Quick Start Guide: GVFS-based methods17455
-Ref: Quick Start Guide: GNOME Online Accounts based methods17851
-Ref: Quick Start Guide: Android18393
-Ref: Quick Start Guide: rclone method18625
-Node: Configuration18952
-Node: Connection types21424
-Node: Inline methods22838
-Node: External methods27800
-Node: GVFS-based methods38438
-Node: Default Method41707
-Node: Default User44724
-Node: Default Host46253
-Node: Multi-hops47385
-Node: Firewalls51577
-Node: Customizing Methods53034
-Node: Customizing Completion55374
-Node: Password handling58864
-Ref: Using an authentication file59334
-Ref: Caching passwords60836
-Node: Connection caching61354
-Node: Predefined connection information62284
-Node: Remote programs66378
-Node: Remote shell setup69299
-Node: Android shell setup78915
-Node: Auto-save and Backup81302
-Node: Windows setup hints84377
-Node: Usage85997
-Node: File name syntax87350
-Node: Change file name syntax89357
-Node: File name completion90788
-Node: Ad-hoc multi-hops93943
-Node: Remote processes96009
-Ref: Running a debugger on a remote host105656
-Node: Cleanup remote connections107626
-Node: Renaming remote files109327
-Node: Archive file names113546
-Node: Bug Reports118060
-Node: Frequently Asked Questions120801
-Node: Files directories and localnames145166
-Node: Localname deconstruction145602
-Node: External packages146255
-Node: Traces and Profiles148300
-Node: GNU Free Documentation License150269
-Node: Function Index175642
-Node: Variable Index178520
-Node: Concept Index186490
+Node: Overview5421
+Node: Obtaining TRAMP10755
+Node: Quick Start Guide13202
+Ref: Quick Start Guide: File name syntax13979
+Ref: Quick Start Guide: ssh and plink methods15081
+Ref: Quick Start Guide: su, sudo and sg methods15625
+Ref: Quick Start Guide: ssh, plink, su, sudo and sg methods16189
+Ref: Quick Start Guide: sudoedit method16719
+Ref: Quick Start Guide: smb method17130
+Ref: Quick Start Guide: GVFS-based methods17461
+Ref: Quick Start Guide: GNOME Online Accounts based methods17857
+Ref: Quick Start Guide: Android18399
+Ref: Quick Start Guide: rclone method18631
+Node: Configuration18958
+Node: Connection types21430
+Node: Inline methods22844
+Node: External methods27806
+Node: GVFS-based methods38444
+Node: Default Method41713
+Node: Default User44730
+Node: Default Host46259
+Node: Multi-hops47391
+Node: Firewalls51583
+Node: Customizing Methods53040
+Node: Customizing Completion55381
+Node: Password handling58871
+Ref: Using an authentication file59341
+Ref: Caching passwords60843
+Node: Connection caching61361
+Node: Predefined connection information62291
+Node: Remote programs66385
+Node: Remote shell setup69306
+Node: Android shell setup78922
+Node: Auto-save and Backup81309
+Node: Windows setup hints84384
+Node: Usage86004
+Node: File name syntax87357
+Node: Change file name syntax89364
+Node: File name completion90795
+Node: Ad-hoc multi-hops93950
+Node: Remote processes96016
+Ref: Running a debugger on a remote host105663
+Node: Cleanup remote connections107633
+Node: Renaming remote files109334
+Node: Archive file names113553
+Node: Bug Reports118067
+Node: Frequently Asked Questions120808
+Node: Files directories and localnames145173
+Node: Localname deconstruction145609
+Node: External packages146262
+Node: Traces and Profiles148307
+Node: GNU Free Documentation License150276
+Node: Function Index175649
+Node: Variable Index178527
+Node: Concept Index186497
End Tag Table
diff --git a/trampver.el b/trampver.el
index 8fdae2e..3514f62 100644
--- a/trampver.el
+++ b/trampver.el
@@ -39,7 +39,7 @@
(defvar inhibit-message)
;;;###tramp-autoload
-(defconst tramp-version "2.4.4"
+(defconst tramp-version "2.4.4.1"
"This version of Tramp.")
;;;###tramp-autoload
@@ -75,7 +75,7 @@
;; Check for Emacs version.
(let ((x (if (not (string-lessp emacs-version "24.4"))
"ok"
- (format "Tramp 2.4.4 is not fit for %s"
+ (format "Tramp 2.4.4.1 is not fit for %s"
(replace-regexp-in-string "\n" "" (emacs-version))))))
(unless (string-equal "ok" x) (error "%s" x)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/tramp eaeda68: Tramp ELPA version 2.4.4.1 released,
Michael Albinus <=