[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
tramp (2.0.28); tramp-auto-save-directory broken (at least in XEmacs); p
|
From: |
Ken Neighbors |
|
Subject: |
tramp (2.0.28); tramp-auto-save-directory broken (at least in XEmacs); patch included |
|
Date: |
Tue, 11 Feb 2003 12:43:30 -0800 |
--bug report follows this line--
I set the variable tramp-auto-save-directory in my ~/.xemacs/init.el,
but it doesn't work (the directory is automatically created when I
edit a remote file, but the file is still auto-saved in the remote
location). I'm using XEmacs 21.4 and tramp version 2.0.28 (not the
one included in XEmacs, but installed separately from Debian).
The problem is that the function tramp-make-auto-save-file-name sets
buffer-file-name before calling make-auto-save-file-name, but XEmacs
ignores this setting because it looks first at buffer-file-truename.
Here are the first few lines from the make-auto-save-file-name
function defined in the file auto-save.el from the XEmacs
distribution:
(setq file-name (or file-name
buffer-file-truename
(and buffer-file-name
(expand-file-name buffer-file-name))))
Here's my patch to tramp.el. The fix is to simply pass the newly
defined buffer-file-name as an argument to the
make-auto-save-file-name function, since the file-name argument takes
precedence over the buffer-local variables buffer-file-truename and
buffer-file-name as you can see in the code snippet above.
--- usr-share-emacs-site-lisp-tramp-tramp.el.orig 2003-02-11
12:20:42.000000000 -0800
+++ usr-share-emacs-site-lisp-tramp-tramp.el 2003-02-11 12:15:01.000000000
-0800
@@ -6027,7 +6027,7 @@
("]" . "_r"))
fn)
tramp-auto-save-directory)))
- (make-auto-save-file-name)))
+ (make-auto-save-file-name buffer-file-name)))
(defadvice make-auto-save-file-name
(around tramp-advice-make-auto-save-file-name () activate)
Emacs : XEmacs 21.4 (patch 8) "Honest Recruiter" [Lucid] (i386-debian-linux)
of Tue Aug 6 2002 on eeyore
Package: tramp (2.0.28)
current state:
==============
(setq
tramp-ls-command nil
tramp-test-groks-nt nil
tramp-file-exists-command nil
tramp-current-multi-method nil
tramp-current-method nil
tramp-current-user nil
tramp-current-host nil
tramp-auto-save-directory "~/.tramp"
tramp-default-method "ssh"
tramp-rsh-end-of-line "\n"
tramp-password-end-of-line "\n"
tramp-remote-path '("/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin"
"/usr/ccs/bin" "/local/bin" "/local/freeware/bin"
"/local/gnu/bin" "/usr/freeware/bin" "/usr/pkg/bin"
"/usr/contrib/bin")
tramp-login-prompt-regexp ".*ogin: *"
tramp-password-prompt-regexp "^.*\\([pP]assword\\|passphrase.*\\): ? *"
tramp-wrong-passwd-regexp "^.*\\(?:Connection \\(?:closed\\|refused\\)\\|Host
key verification failed\\.\\|Login \\(?:Incorrect\\|incorrect\\)\\|Name or
service not known\\|Permission denied\\.\\|Sorry, try
again\\.\\).*\\|^.*\\(Received signal [0-9]+\\).*"
tramp-yesno-prompt-regexp "\\(?:Are you sure you want to continue connecting
(yes/no)\\?\\)\\s-*"
tramp-yn-prompt-regexp "\\(?:Store key in cache\\? (y/n)\\)\\s-*"
tramp-temp-name-prefix "tramp."
tramp-file-name-structure '("^/\\[\\(\\([a-zA-Z_0-9-]+\\)/\\)?\\(\\([^:@/
]*\\)@\\)?\\([a-zA-Z0-9_.#-]*\\)\\]\\(.*$\\)" 2 4 5 6)
tramp-file-name-regexp "\\`/\\[.*\\]"
tramp-multi-file-name-structure
'("^/\\[\\(\\([a-zA-Z_0-9-]+\\)\\)?\\(\\(/%s\\)+\\)?\\]\\(.*$\\)" 2 3 -1)
tramp-multi-file-name-hop-structure '("\\([a-zA-Z_0-9-]+\\):\\([^:@/
]*\\)@\\([a-zA-Z0-9_.#-]*\\)" 1 2 3)
tramp-multi-methods '("multi" "multiu")
tramp-multi-connection-function-alist '(("telnet" tramp-multi-connect-telnet
"telnet %h%n")
("rsh" tramp-multi-connect-rlogin
"rsh %h -l %u%n")
("ssh" tramp-multi-connect-rlogin
"ssh %h -l %u%n")
("su" tramp-multi-connect-su
"su - %u%n")
("sudo" tramp-multi-connect-su
"sudo -u %u -s%n")
)
tramp-methods '(("smb")
("rcp" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "rsh") (tramp-rcp-program "rcp")
(tramp-remote-sh "/bin/sh") (tramp-rsh-args nil)
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg "-p")
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("scp" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program "scp")
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-e" "none"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg "-p")
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("scp1" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program "scp")
(tramp-remote-sh "/bin/sh")
(tramp-rsh-args ("-1" "-e" "none")) (tramp-rcp-args ("-1"))
(tramp-rcp-keep-date-arg "-p") (tramp-su-program nil)
(tramp-su-args nil) (tramp-telnet-program nil)
(tramp-telnet-args nil))
("scp2" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program "scp")
(tramp-remote-sh "/bin/sh")
(tramp-rsh-args ("-2" "-e" "none")) (tramp-rcp-args ("-2"))
(tramp-rcp-keep-date-arg "-p") (tramp-su-program nil)
(tramp-su-args nil) (tramp-telnet-program nil)
(tramp-telnet-args nil))
("scp1_old"
(tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh1") (tramp-rcp-program "scp1")
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-e" "none"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg "-p")
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("scp2_old"
(tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh2") (tramp-rcp-program "scp2")
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-e" "none"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg "-p")
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("rsync" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program "rsync")
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-e" "none"))
(tramp-rcp-args ("-e" "ssh")) (tramp-rcp-keep-date-arg "-t")
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("rsh" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "rsh") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args nil)
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("ssh" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-e" "none"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("ssh1" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh")
(tramp-rsh-args ("-1" "-e" "none")) (tramp-rcp-args ("-1"))
(tramp-rcp-keep-date-arg nil) (tramp-su-program nil)
(tramp-su-args nil) (tramp-telnet-program nil)
(tramp-telnet-args nil))
("ssh2" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh")
(tramp-rsh-args ("-2" "-e" "none")) (tramp-rcp-args ("-2"))
(tramp-rcp-keep-date-arg nil) (tramp-su-program nil)
(tramp-su-args nil) (tramp-telnet-program nil)
(tramp-telnet-args nil))
("ssh1_old"
(tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh1") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-e" "none"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("ssh2_old"
(tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh2") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-e" "none"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("telnet"
(tramp-connection-function tramp-open-connection-telnet)
(tramp-rsh-program nil) (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args nil)
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program "telnet") (tramp-telnet-args nil))
("su" (tramp-connection-function tramp-open-connection-su)
(tramp-rsh-program nil) (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args nil)
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program "su") (tramp-su-args ("-" "%u"))
(tramp-telnet-program nil) (tramp-telnet-args nil))
("sudo" (tramp-connection-function tramp-open-connection-su)
(tramp-rsh-program nil) (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args nil)
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program "sudo") (tramp-su-args ("-u" "%u" "-s"))
(tramp-telnet-program nil) (tramp-telnet-args nil))
("multi"
(tramp-connection-function tramp-open-connection-multi)
(tramp-rsh-program nil) (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args nil)
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("scpx" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program "scp")
(tramp-remote-sh "/bin/sh")
(tramp-rsh-args ("-e" "none" "-t" "-t" "/bin/sh"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg "-p")
(tramp-telnet-program nil) (tramp-telnet-args nil))
("sshx" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "ssh") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh")
(tramp-rsh-args ("-e" "none" "-t" "-t" "/bin/sh"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("krlogin"
(tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "krlogin") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-x"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("plink" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "plink") (tramp-rcp-program nil)
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-ssh"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg nil)
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("pscp" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "plink") (tramp-rcp-program "pscp")
(tramp-remote-sh "/bin/sh") (tramp-rsh-args ("-ssh"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg "-p")
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
("fcp" (tramp-connection-function tramp-open-connection-rsh)
(tramp-rsh-program "fsh") (tramp-rcp-program "fcp")
(tramp-remote-sh "/bin/sh -i") (tramp-rsh-args ("sh" "-i"))
(tramp-rcp-args nil) (tramp-rcp-keep-date-arg "-p")
(tramp-su-program nil) (tramp-su-args nil)
(tramp-telnet-program nil) (tramp-telnet-args nil))
)
tramp-end-of-output "///9818b9d2ebe8ee85247702c28a47815e"
tramp-coding-commands '(("mimencode -b" "mimencode -u -b" base64-encode-region
base64-decode-region)
("mmencode -b" "mmencode -u -b" base64-encode-region
base64-decode-region)
("recode data..base64" "recode base64..data"
base64-encode-region base64-decode-region)
("uuencode xxx" "uudecode -o -" tramp-uuencode-region
uudecode-decode-region)
("uuencode xxx" "uudecode -p" tramp-uuencode-region
uudecode-decode-region)
("uuencode xxx" "tramp_uudecode" tramp-uuencode-region
uudecode-decode-region)
("tramp_encode_with_module" "tramp_decode_with_module"
base64-encode-region base64-decode-region)
("tramp_encode" "tramp_decode" base64-encode-region
base64-decode-region)
)
tramp-actions-before-shell '((tramp-password-prompt-regexp
tramp-action-password)
(tramp-login-prompt-regexp tramp-action-login)
(shell-prompt-pattern tramp-action-succeed)
(tramp-shell-prompt-pattern tramp-action-succeed)
(tramp-wrong-passwd-regexp
tramp-action-permission-denied)
(tramp-yesno-prompt-regexp tramp-action-yesno)
(tramp-yn-prompt-regexp tramp-action-yn)
(tramp-terminal-prompt-regexp
tramp-action-terminal)
)
tramp-multi-actions '((tramp-password-prompt-regexp
tramp-multi-action-password)
(tramp-login-prompt-regexp tramp-multi-action-login)
(shell-prompt-pattern tramp-multi-action-succeed)
(tramp-shell-prompt-pattern tramp-multi-action-succeed)
(tramp-wrong-passwd-regexp
tramp-multi-action-permission-denied)
)
tramp-terminal-type "dumb"
tramp-shell-prompt-pattern "^[^#$%>\n]*[#$%>] *"
shell-prompt-pattern "^\\([^#$%>\n]*[#$%>]\\(\\[[=a-zA-Z0-9\"?,;]+\\)* *\\)+"
backup-by-copying nil
backup-by-copying-when-linked nil
backup-by-copying-when-mismatch nil
nil nil
file-name-handler-alist '(("^/\\([[][^]]*\\)?$" .
tramp-completion-file-name-handler)
("\\`/\\[.*\\]" . tramp-file-name-handler)
("^/[^/:]+:" . remote-path-file-handler-function))
)
- tramp (2.0.28); tramp-auto-save-directory broken (at least in XEmacs); patch included,
Ken Neighbors <=