Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
7ab3acf4
Commit
7ab3acf4
authored
Sep 04, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Plain Diff
Merge from trunk.
parents
806add1d
f5e29b9b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
174 additions
and
116 deletions
+174
-116
doc/emacs/ChangeLog
doc/emacs/ChangeLog
+4
-0
doc/emacs/basic.texi
doc/emacs/basic.texi
+3
-1
lisp/ChangeLog
lisp/ChangeLog
+16
-0
lisp/net/tramp-sh.el
lisp/net/tramp-sh.el
+59
-113
lisp/net/tramp.el
lisp/net/tramp.el
+92
-2
No files found.
doc/emacs/ChangeLog
View file @
7ab3acf4
2011-09-04 Eli Zaretskii <eliz@gnu.org>
* basic.texi (Inserting Text): Add index entries. (Bug#9433)
2011-08-29 Chong Yidong <cyd@stupidchicken.com>
* modes.texi (Choosing Modes): auto-mode-case-fold is now t.
...
...
doc/emacs/basic.texi
View file @
7ab3acf4
...
...
@@ -101,7 +101,9 @@ character to insert (@pxref{Arguments}).
@findex ucs-insert
@kindex C-x 8 RET
@cindex Unicode
@cindex Unicode characters, inserting
@cindex insert Unicode character
@cindex characters, inserting by name or code-point
Instead of @kbd{C-q}, you can use @kbd{C-x 8 @key{RET}}
(@code{ucs-insert}) to insert a character based on its Unicode name or
code-point. This command prompts for a character to insert, using
...
...
lisp/ChangeLog
View file @
7ab3acf4
2011-09-04 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (top): Require 'shell. Use `tramp-unload-hook' but
`tramp-cache-unload-hook' where appropriate.
(tramp-methods): Rename `tramp-remote-sh' to
`tramp-remote-shell'. Add `tramp-remote-shell-args'.
(tramp-handle-shell-command): New defun, moved from tramp-sh.el.
* net/tramp-sh.el (top): Don't require 'shell.
(tramp-methods): Add `tramp-remote-shell' and
`tramp-remote-shell-args' entries.
(tramp-sh-file-name-handler-alist): Use `tramp-handle-shell-command'.
(tramp-sh-handle-shell-command): Remove.
(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
Use `tramp-remote-shell'.
2011-09-03 Chong Yidong <cyd@stupidchicken.com>
* mail/sendmail.el (sendmail-query-once-function): Deleted.
...
...
lisp/net/tramp-sh.el
View file @
7ab3acf4
...
...
@@ -28,7 +28,6 @@
(eval-when-compile (require 'cl)) ; ignore-errors
(require 'tramp)
(
require
'shell
)
;; Pacify byte-compiler. The function is needed on XEmacs only. I'm
;; not sure at all that this is the right way to do it, but let's hope
...
...
@@ -91,7 +90,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
'("rcp"
(tramp-login-program "rsh")
(tramp-login-args (("%h") ("-l" "%u")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "rcp")
(tramp-copy-args (("-p" "%k") ("-r")))
(tramp-copy-keep-date t)
...
...
@@ -101,7 +101,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
'("remcp"
(tramp-login-program "remsh")
(tramp-login-args (("%h") ("-l" "%u")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "rcp")
(tramp-copy-args (("-p" "%k")))
(tramp-copy-keep-date t)))
...
...
@@ -111,7 +112,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-login-program "ssh")
(tramp-login-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "scp")
(tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r")))
(tramp-copy-keep-date t)
...
...
@@ -127,7 +129,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-login-args (("-l" "%u") ("-p" "%p")
("-1") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "scp")
(tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
(tramp-copy-keep-date t)
...
...
@@ -143,7 +146,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-login-args (("-l" "%u") ("-p" "%p")
("-2") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "scp")
(tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
(tramp-copy-keep-date t)
...
...
@@ -161,7 +165,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
("-o" "ControlMaster=yes")
("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "scp")
(tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r")
("-o" "ControlPath=%t.%%r@%%h:%%p")
...
...
@@ -180,7 +185,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
("-e" "none") ("-t" "-t")
("%h") ("/bin/sh")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "scp")
(tramp-copy-args (("-P" "%p") ("-p" "%k") ("-q") ("-r")))
(tramp-copy-keep-date t)
...
...
@@ -195,7 +201,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-login-program "ssh")
(tramp-login-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "sftp")))
;;;###tramp-autoload
(add-to-list 'tramp-methods
...
...
@@ -203,7 +210,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-login-program "ssh")
(tramp-login-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "rsync")
(tramp-copy-args (("-e" "ssh") ("-t" "%k") ("-r")))
(tramp-copy-keep-date t)
...
...
@@ -218,7 +226,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
("-o" "ControlMaster=yes")
("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "rsync")
(tramp-copy-args (("-t" "%k") ("-r")))
(tramp-copy-env (("RSYNC_RSH")
...
...
@@ -234,20 +243,23 @@ detected as prompt when being sent on echoing hosts, therefore.")
'("rsh"
(tramp-login-program "rsh")
(tramp-login-args (("%h") ("-l" "%u")))
(
tramp-remote-sh
"/bin/sh"
)))
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("remsh"
(tramp-login-program "remsh")
(tramp-login-args (("%h") ("-l" "%u")))
(
tramp-remote-sh
"/bin/sh"
)))
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("ssh"
(tramp-login-program "ssh")
(tramp-login-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
("-o" "UserKnownHostsFile=/dev/null")
("-o" "StrictHostKeyChecking=no")))
...
...
@@ -259,7 +271,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-login-args (("-l" "%u") ("-p" "%p")
("-1") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
("-o" "UserKnownHostsFile=/dev/null")
("-o" "StrictHostKeyChecking=no")))
...
...
@@ -271,7 +284,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-login-args (("-l" "%u") ("-p" "%p")
("-2") ("-e" "none") ("%h")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
("-o" "UserKnownHostsFile=/dev/null")
("-o" "StrictHostKeyChecking=no")))
...
...
@@ -284,7 +298,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
("-e" "none") ("-t" "-t")
("%h") ("/bin/sh")))
(tramp-async-args (("-q")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
("-o" "UserKnownHostsFile=/dev/null")
("-o" "StrictHostKeyChecking=no")))
...
...
@@ -294,38 +309,44 @@ detected as prompt when being sent on echoing hosts, therefore.")
'("telnet"
(tramp-login-program "telnet")
(tramp-login-args (("%h") ("%p")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-default-port 23)))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("su"
(tramp-login-program "su")
(tramp-login-args (("-") ("%u")))
(
tramp-remote-sh
"/bin/sh"
)))
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("sudo"
(tramp-login-program "sudo")
(tramp-login-args (("-u" "%u") ("-s") ("-H") ("-p" "Password:")))
(
tramp-remote-sh
"/bin/sh"
)))
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("ksu"
(tramp-login-program "ksu")
(tramp-login-args (("%u") ("-q")))
(
tramp-remote-sh
"/bin/sh"
)))
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("krlogin"
(tramp-login-program "krlogin")
(tramp-login-args (("%h") ("-l" "%u") ("-x")))
(
tramp-remote-sh
"/bin/sh"
)))
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("plink"
(tramp-login-program "plink")
(tramp-login-args (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-password-end-of-line "xy") ;see docstring for "xy"
(tramp-default-port 22)))
;;;###tramp-autoload
...
...
@@ -333,7 +354,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
'("plink1"
(tramp-login-program "plink")
(tramp-login-args (("-l" "%u") ("-P" "%p") ("-1" "-ssh") ("%h")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-password-end-of-line "xy") ;see docstring for "xy"
(tramp-default-port 22)))
;;;###tramp-autoload
...
...
@@ -348,13 +370,15 @@ detected as prompt when being sent on echoing hosts, therefore.")
tramp-terminal-type
tramp-initial-end-of-output))
("/bin/sh")))
(
tramp-remote-sh
"/bin/sh"
)))
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))
;;;###tramp-autoload
(add-to-list 'tramp-methods
'("pscp"
(tramp-login-program "plink")
(tramp-login-args (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "pscp")
(tramp-copy-args (("-P" "%p") ("-scp") ("-p" "%k")
("-q") ("-r")))
...
...
@@ -367,7 +391,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
'("psftp"
(tramp-login-program "plink")
(tramp-login-args (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
(
tramp-remote-sh
"/bin/sh"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))
(tramp-copy-program "pscp")
(tramp-copy-args (("-P" "%p") ("-sftp") ("-p" "%k")
("-q") ("-r")))
...
...
@@ -379,7 +404,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
'("fcp"
(tramp-login-program "fsh")
(tramp-login-args (("%h") ("-l" "%u") ("sh" "-i")))
(
tramp-remote-sh
"/bin/sh -i"
)
(tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-i") ("-c"))
(tramp-copy-program "fcp")
(tramp-copy-args (("-p" "%k")))
(tramp-copy-keep-date t)))
...
...
@@ -942,7 +968,7 @@ This is used to map a mode number to a permission string.")
(executable-find . tramp-sh-handle-executable-find)
(start-file-process . tramp-sh-handle-start-file-process)
(process-file . tramp-sh-handle-process-file)
(
shell-command
.
tramp-
sh-
handle-shell-command
)
(shell-command . tramp-handle-shell-command)
(insert-directory . tramp-sh-handle-insert-directory)
(expand-file-name . tramp-sh-handle-expand-file-name)
(substitute-in-file-name . tramp-handle-substitute-in-file-name)
...
...
@@ -2853,7 +2879,7 @@ the result will be a local, non-Tramp, filename."
;; `process-file-side-effects' has been introduced with GNU
;; Emacs 23.2. If set to `nil', no remote file will be changed
;; by `program'. If it doesn't exist, we assume its default
;; value
'
t'.
;; value
`
t'.
(unless (and (boundp 'process-file-side-effects)
(not (symbol-value 'process-file-side-effects)))
(tramp-flush-directory-property v ""))
...
...
@@ -2873,87 +2899,6 @@ the result will be a local, non-Tramp, filename."
(apply 'call-process program tmpfile buffer display args)
(delete-file tmpfile))))
(
defun
tramp-sh-handle-shell-command
(
command
&optional
output-buffer
error-buffer
)
"Like `shell-command' for Tramp files."
(
let*
((
asynchronous
(
string-match
"[ \t]*&[ \t]*\\'"
command
))
;; We cannot use `shell-file-name' and `shell-command-switch',
;; they are variables of the local host.
(
args
(
list
(
tramp-get-method-parameter
(
tramp-file-name-method
(
tramp-dissect-file-name
default-directory
))
'tramp-remote-sh
)
"-c"
(
substring
command
0
asynchronous
)))
current-buffer-p
(
output-buffer
(
cond
((
bufferp
output-buffer
)
output-buffer
)
((
stringp
output-buffer
)
(
get-buffer-create
output-buffer
))
(
output-buffer
(
setq
current-buffer-p
t
)
(
current-buffer
))
(
t
(
get-buffer-create
(
if
asynchronous
"*Async Shell Command*"
"*Shell Command Output*"
)))))
(
error-buffer
(
cond
((
bufferp
error-buffer
)
error-buffer
)
((
stringp
error-buffer
)
(
get-buffer-create
error-buffer
))))
(
buffer
(
if
(
and
(
not
asynchronous
)
error-buffer
)
(
with-parsed-tramp-file-name
default-directory
nil
(
list
output-buffer
(
tramp-make-tramp-temp-file
v
)))
output-buffer
))
(
p
(
get-buffer-process
output-buffer
)))
;; Check whether there is another process running. Tramp does not
;; support 2 (asynchronous) processes in parallel.
(
when
p
(
if
(
yes-or-no-p
"A command is running. Kill it? "
)
(
ignore-errors
(
kill-process
p
))
(
error
"Shell command in progress"
)))
(
if
current-buffer-p
(
progn
(
barf-if-buffer-read-only
)
(
push-mark
nil
t
))
(
with-current-buffer
output-buffer
(
setq
buffer-read-only
nil
)
(
erase-buffer
)))
(
if
(
and
(
not
current-buffer-p
)
(
integerp
asynchronous
))
(
prog1
;; Run the process.
(
apply
'start-file-process
"*Async Shell*"
buffer
args
)
;; Display output.
(
pop-to-buffer
output-buffer
)
(
setq
mode-line-process
'
(
":%s"
))
(
shell-mode
))
(
prog1
;; Run the process.
(
apply
'process-file
(
car
args
)
nil
buffer
nil
(
cdr
args
))
;; Insert error messages if they were separated.
(
when
(
listp
buffer
)
(
with-current-buffer
error-buffer
(
insert-file-contents
(
cadr
buffer
)))
(
delete-file
(
cadr
buffer
)))
(
if
current-buffer-p
;; This is like exchange-point-and-mark, but doesn't
;; activate the mark. It is cleaner to avoid activation,
;; even though the command loop would deactivate the mark
;; because we inserted text.
(
goto-char
(
prog1
(
mark
t
)
(
set-marker
(
mark-marker
)
(
point
)
(
current-buffer
))))
;; There's some output, display it.
(
when
(
with-current-buffer
output-buffer
(
>
(
point-max
)
(
point-min
)))
(
if
(
functionp
'display-message-or-buffer
)
(
tramp-compat-funcall
'display-message-or-buffer
output-buffer
)
(
pop-to-buffer
output-buffer
))))))))
(defun tramp-sh-handle-file-local-copy (filename)
"Like `file-local-copy' for Tramp files."
(with-parsed-tramp-file-name filename nil
...
...
@@ -3680,7 +3625,7 @@ file exists and nonzero exit status otherwise."
(tramp-set-connection-property
vec "remote-shell"
(tramp-get-method-parameter
(
tramp-file-name-method
vec
)
'tramp-remote-sh
)))))))))
(tramp-file-name-method vec) 'tramp-remote-sh
ell
)))))))))
;; Utility functions.
...
...
@@ -3716,7 +3661,8 @@ process to set up. VEC specifies the connection."
;; discarded as well.
(tramp-open-shell
vec
(
tramp-get-method-parameter
(
tramp-file-name-method
vec
)
'tramp-remote-sh
))
(tramp-get-method-parameter
(tramp-file-name-method vec) 'tramp-remote-shell))
;; Disable echo.
(tramp-message vec 5 "Setting up remote shell environment")
...
...
lisp/net/tramp.el
View file @
7ab3acf4
...
...
@@ -58,6 +58,7 @@
;;; Code:
(
require
'tramp-compat
)
(
require
'shell
)
;;; User Customizable Internal Variables:
...
...
@@ -190,13 +191,16 @@ See the variable `tramp-encoding-shell' for more information."
This is a list of entries of the form (NAME PARAM1 PARAM2 ...).
Each NAME stands for a remote access method. Each PARAM is a
pair of the form (KEY VALUE). The following KEYs are defined:
* `tramp-remote-sh'
* `tramp-remote-sh
ell
'
This specifies the Bourne shell to use on the remote host. This
MUST be a Bourne-like shell. It is normally not necessary to set
this to any value other than \"/bin/sh\": Tramp wants to use a shell
which groks tilde expansion, but it can search for it. Also note
that \"/bin/sh\" exists on all Unixen, this might not be true for
the value that you decide to use. You Have Been Warned.
* `tramp-remote-shell-args'
For implementation of `shell-command', this specifies the
argument to let `tramp-remote-shell' run a command.
* `tramp-login-program'
This specifies the name of the program to use for logging in to the
remote host. This may be the name of rsh or a workalike program,
...
...
@@ -2959,6 +2963,92 @@ User is always nil."
(
delete-file
local-copy
)))))
t
)))
(
defun
tramp-handle-shell-command
(
command
&optional
output-buffer
error-buffer
)
"Like `shell-command' for Tramp files."
(
let*
((
asynchronous
(
string-match
"[ \t]*&[ \t]*\\'"
command
))
;; We cannot use `shell-file-name' and `shell-command-switch',
;; they are variables of the local host.
(
args
(
append
(
cons
(
tramp-get-method-parameter
(
tramp-file-name-method
(
tramp-dissect-file-name
default-directory
))
'tramp-remote-shell
)
(
tramp-get-method-parameter
(
tramp-file-name-method
(
tramp-dissect-file-name
default-directory
))
'tramp-remote-shell-args
))
(
list
(
substring
command
0
asynchronous
))))
current-buffer-p
(
output-buffer
(
cond
((
bufferp
output-buffer
)
output-buffer
)
((
stringp
output-buffer
)
(
get-buffer-create
output-buffer
))
(
output-buffer
(
setq
current-buffer-p
t
)
(
current-buffer
))
(
t
(
get-buffer-create
(
if
asynchronous
"*Async Shell Command*"
"*Shell Command Output*"
)))))
(
error-buffer
(
cond
((
bufferp
error-buffer
)
error-buffer
)
((
stringp
error-buffer
)
(
get-buffer-create
error-buffer
))))
(
buffer
(
if
(
and
(
not
asynchronous
)
error-buffer
)
(
with-parsed-tramp-file-name
default-directory
nil
(
list
output-buffer
(
tramp-make-tramp-temp-file
v
)))
output-buffer
))
(
p
(
get-buffer-process
output-buffer
)))
;; Check whether there is another process running. Tramp does not
;; support 2 (asynchronous) processes in parallel.
(
when
p
(
if
(
yes-or-no-p
"A command is running. Kill it? "
)
(
ignore-errors
(
kill-process
p
))
(
error
"Shell command in progress"
)))
(
if
current-buffer-p
(
progn
(
barf-if-buffer-read-only
)
(
push-mark
nil
t
))
(
with-current-buffer
output-buffer
(
setq
buffer-read-only
nil
)
(
erase-buffer
)))
(
if
(
and
(
not
current-buffer-p
)
(
integerp
asynchronous
))
(
prog1
;; Run the process.
(
apply
'start-file-process
"*Async Shell*"
buffer
args
)
;; Display output.
(
pop-to-buffer
output-buffer
)
(
setq
mode-line-process
'
(
":%s"
))
(
shell-mode
))
(
prog1
;; Run the process.
(
apply
'process-file
(
car
args
)
nil
buffer
nil
(
cdr
args
))
;; Insert error messages if they were separated.
(
when
(
listp
buffer
)
(
with-current-buffer
error-buffer
(
insert-file-contents
(
cadr
buffer
)))
(
delete-file
(
cadr
buffer
)))
(
if
current-buffer-p
;; This is like exchange-point-and-mark, but doesn't
;; activate the mark. It is cleaner to avoid activation,
;; even though the command loop would deactivate the mark
;; because we inserted text.
(
goto-char
(
prog1
(
mark
t
)
(
set-marker
(
mark-marker
)
(
point
)
(
current-buffer
))))
;; There's some output, display it.
(
when
(
with-current-buffer
output-buffer
(
>
(
point-max
)
(
point-min
)))
(
if
(
functionp
'display-message-or-buffer
)
(
tramp-compat-funcall
'display-message-or-buffer
output-buffer
)
(
pop-to-buffer
output-buffer
))))))))
(
defun
tramp-handle-substitute-in-file-name
(
filename
)
"Like `substitute-in-file-name' for Tramp files.
\"//\" and \"/~\" substitute only in the local filename part.
...
...
@@ -3477,7 +3567,7 @@ Return the local name of the temporary file."
(
ignore-errors
(
delete-file
tramp-temp-buffer-file-name
))))
(
add-hook
'kill-buffer-hook
'tramp-delete-temp-file-function
)
(
add-hook
'tramp-
cache-
unload-hook
(
add-hook
'tramp-unload-hook
(
lambda
()
(
remove-hook
'kill-buffer-hook
'tramp-delete-temp-file-function
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment