+2007-10-03 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
+ (tramp-file-name-handler-alist): Add
+ `tramp-handle-insert-file-contents-literally'. Neded for XEmacs.
+ (tramp-make-temp-file): Use `make-temp-name'. `make-temp-file',
+ used before, creates the file already, which is not desired.
+ (tramp-do-copy-or-rename-file-directly): Simplify handling of
+ temporary file.
+ (tramp-handle-insert-file-contents): Assign the result in the
+ short track case.
+ (tramp-handle-insert-file-contents-literally): New defun.
+ (tramp-completion-mode-p): Revert change from 2007-09-24.
+ Checking for `return' etc as last character is not sufficient, for
+ example in dired-mode when entering <g> (revert-buffer) or
+ <s> (dired-sort).
+
+ * net/tramp-compat.el (top): Add also compatibility code for loading
+ appropriate timer package.
+ (tramp-compat-copy-tree): Check for `subrp' and `symbol-file' in
+ order to avoid autoloading problems.
+
+ * net/tramp-fish.el:
+ * net/tramp-smb.el: Move further compatibility code to
+ tramp-compat.el.
+
+ * net/tramp-ftp.el (tramp-ftp-file-name-handler): Handle the case
+ where the second parameter of `copy-file' or `rename-file' is a
+ remote file but not via ftp.
+
2007-10-02 Richard Stallman <rms@gnu.org>
* frame.el (cursor-in-non-selected-windows): Doc fix.
-;;; tramp-gw.el --- Tramp compatibility functions
+;;; tramp-compat.el --- Tramp compatibility functions
;; Copyright (C) 2007 Free Software Foundation, Inc.
;;; Code:
-;; Pacify byte-compiler
-(eval-when-compile
+(eval-and-compile
+
+ ;; Pacify byte-compiler.
(require 'cl)
- (require 'custom))
+ (require 'custom)
-;; Avoid byte-compiler warnings if the byte-compiler supports this.
-;; Currently, XEmacs supports this.
-;(eval-when-compile
-; (when (featurep 'xemacs)
-; (byte-compiler-options (warnings (- unused-vars)))))
+ ;; Load the appropriate timer package.
+ (if (featurep 'xemacs)
+ (require 'timer-funcs)
+ (require 'timer))
-;; `last-coding-system-used' is unknown in XEmacs.
-(eval-when-compile
+ ;; Avoid byte-compiler warnings if the byte-compiler supports this.
+ ;; Currently, XEmacs supports this.
+ (when (featurep 'xemacs)
+ (unless (boundp 'byte-compile-default-warnings)
+ (defvar byte-compile-default-warnings nil))
+ (delq 'unused-vars byte-compile-default-warnings))
+
+ ;; `last-coding-system-used' is unknown in XEmacs.
(unless (boundp 'last-coding-system-used)
- (defvar last-coding-system-used nil)))
+ (defvar last-coding-system-used nil))
-;; `directory-sep-char' is an obsolete variable in Emacs. But it is
-;; used in XEmacs, so we set it here and there. The following is needed
-;; to pacify Emacs byte-compiler.
-(eval-when-compile
+ ;; `directory-sep-char' is an obsolete variable in Emacs. But it is
+ ;; used in XEmacs, so we set it here and there. The following is
+ ;; needed to pacify Emacs byte-compiler.
(unless (boundp 'byte-compile-not-obsolete-var)
(defvar byte-compile-not-obsolete-var nil))
- (setq byte-compile-not-obsolete-var 'directory-sep-char))
+ (setq byte-compile-not-obsolete-var 'directory-sep-char)
-;; `with-temp-message' does not exists in XEmacs.
-(eval-and-compile
+ ;; `with-temp-message' does not exists in XEmacs.
(condition-case nil
(with-temp-message (current-message) nil)
- (error (defmacro with-temp-message (message &rest body) `(progn ,@body)))))
+ (error (defmacro with-temp-message (message &rest body) `(progn ,@body))))
-;; `set-buffer-multibyte' comes from Emacs Leim.
-(eval-and-compile
+ ;; `set-buffer-multibyte' comes from Emacs Leim.
(unless (fboundp 'set-buffer-multibyte)
- (defalias 'set-buffer-multibyte 'ignore)))
+ (defalias 'set-buffer-multibyte 'ignore))
-;; `font-lock-add-keywords' does not exist in XEmacs.
-(eval-and-compile
+ ;; `font-lock-add-keywords' does not exist in XEmacs.
(unless (fboundp 'font-lock-add-keywords)
- (defalias 'font-lock-add-keywords 'ignore)))
+ (defalias 'font-lock-add-keywords 'ignore))
+
+ ;; `file-remote-p' has been introduced with Emacs 22. The version
+ ;; of XEmacs is not a magic file name function (yet); this is
+ ;; corrected in tramp-util.el. Here it is sufficient if the
+ ;; function exists.
+ (unless (fboundp 'file-remote-p)
+ (defalias 'file-remote-p 'tramp-handle-file-remote-p))
+
+ ;; `process-file' exists since Emacs 22.
+ (unless (fboundp 'process-file)
+ (defalias 'process-file 'tramp-handle-process-file))
+
+ ;; `start-file-process' is new in Emacs 23.
+ (unless (fboundp 'start-file-process)
+ (defalias 'start-file-process 'tramp-handle-start-file-process))
+
+ ;; `set-file-times' is also new in Emacs 23.
+ (unless (fboundp 'set-file-times)
+ (defalias 'set-file-times 'tramp-handle-set-file-times)))
(defsubst tramp-compat-line-end-position ()
"Return point at end of line (compat function).
For Emacs, this is the variable `temporary-file-directory', for XEmacs
this is the function `temp-directory'."
(cond
- ((boundp 'temporary-file-directory)
- (symbol-value 'temporary-file-directory))
- ((fboundp 'temp-directory)
- (funcall (symbol-function 'temp-directory))) ;pacify byte-compiler
+ ((boundp 'temporary-file-directory) (symbol-value 'temporary-file-directory))
+ ((fboundp 'temp-directory) (funcall (symbol-function 'temp-directory)))
((let ((d (getenv "TEMP"))) (and d (file-directory-p d)))
(file-name-as-directory (getenv "TEMP")))
((let ((d (getenv "TMP"))) (and d (file-directory-p d)))
"`temp-directory' is defined -- using /tmp."))
(file-name-as-directory "/tmp"))))
-;; `most-positive-fixnum' arrived in Emacs 22.
+;; `most-positive-fixnum' arrived in Emacs 22. Before, and in XEmacs,
+;; it is a fixed value.
(defsubst tramp-compat-most-positive-fixnum ()
"Return largest positive integer value (compat function)."
- (cond ((boundp 'most-positive-fixnum)
- (symbol-value 'most-positive-fixnum))
- (t 134217727)))
+ (cond
+ ((boundp 'most-positive-fixnum) (symbol-value 'most-positive-fixnum))
+ ;; Default value in XEmacs and Emacs 21.
+ (t 134217727)))
;; ID-FORMAT exists since Emacs 22.
(defun tramp-compat-file-attributes (filename &optional id-format)
filename newname ok-if-already-exists keep-date preserve-uid-gid)
(copy-file filename newname ok-if-already-exists keep-date)))
-;; `copy-tree' is introduced with Emacs 22. We've adapted the
-;; implementation from Emacs 23.
+;; `copy-tree' is a built-in function in XEmacs. In Emacs 21, it is
+;; an auoloaded function in cl-extra.el. Since Emacs 22, it is part
+;; of subr.el. There are problems when autoloading, therefore we test
+;; for for `subrp' and `symbol-file'. Implementation is taken from Emacs23.
(defun tramp-compat-copy-tree (tree)
"Make a copy of TREE (compat function)."
- (if (functionp 'copy-tree)
+ (if (or (subrp 'copy-tree) (symbol-file 'copy-tree))
(funcall (symbol-function 'copy-tree) tree)
(let (result)
(while (consp tree)
(setq tree (cdr tree)))
(nconc (nreverse result) tree))))
-(eval-and-compile
- (unless (fboundp 'file-remote-p)
- (defalias 'file-remote-p 'tramp-handle-file-remote-p))
-
- (unless (fboundp 'process-file)
- (defalias 'process-file 'tramp-handle-process-file))
-
- (unless (fboundp 'start-file-process)
- (defalias 'start-file-process 'tramp-handle-start-file-process))
-
- (unless (fboundp 'set-file-times)
- (defalias 'set-file-times 'tramp-handle-set-file-times)))
-
(provide 'tramp-compat)
;;; TODO:
(require 'tramp-cache)
(require 'tramp-compat)
-;; `directory-sep-char' is an obsolete variable in Emacs. But it is
-;; used in XEmacs, so we set it here and there. The following is needed
-;; to pacify Emacs byte-compiler.
-(eval-when-compile
- (setq byte-compile-not-obsolete-var 'directory-sep-char))
-
-;; Pacify byte-compiler
-(eval-when-compile
- (require 'cl)
- (require 'custom))
-
;; Define FISH method ...
(defcustom tramp-fish-method "fish"
"*Method to connect via FISH protocol."
(tramp-error
v 'file-error
"Cannot make local copy of non-existing file `%s'" filename))
- (let ((tmpfil (tramp-make-temp-file filename)))
- (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfil)
+ (let ((tmpfile (tramp-make-temp-file filename)))
+ (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile)
(when (tramp-fish-retrieve-data v)
;; Save file
(with-current-buffer (tramp-get-buffer v)
- (write-region (point-min) (point-max) tmpfil))
- (tramp-message v 4 "Fetching %s to tmp file %s...done" filename tmpfil)
- tmpfil))))
+ (write-region (point-min) (point-max) tmpfile))
+ (tramp-message v 4 "Fetching %s to tmp file %s...done" filename tmpfile)
+ tmpfile))))
;; This function should return "foo/" for directories and "bar" for
;; files.
(with-parsed-tramp-file-name default-directory nil
(let ((temp-name-prefix (tramp-make-tramp-temp-file v))
- command input output stderr outbuf tmpfil ret)
+ command input output stderr outbuf tmpfile ret)
;; Compute command.
(setq command (mapconcat 'tramp-shell-quote-argument
(cons program args) " "))
(tramp-shell-quote-argument command) output))
(error nil))
;; Check return code.
- (setq tmpfil (file-local-copy
- (tramp-make-tramp-file-name method user host output)))
+ (setq tmpfile
+ (file-local-copy
+ (tramp-make-tramp-file-name method user host output)))
(with-temp-buffer
- (insert-file-contents tmpfil)
+ (insert-file-contents tmpfile)
(goto-char (point-max))
(forward-line -1)
(looking-at "^###RESULT: \\([0-9]+\\)")
(setq ret (string-to-number (match-string 1)))
(delete-region (point) (point-max))
- (write-region (point-min) (point-max) tmpfil))
+ (write-region (point-min) (point-max) tmpfile))
;; We should show the output anyway.
(when outbuf
- (with-current-buffer outbuf (insert-file-contents tmpfil))
+ (with-current-buffer outbuf (insert-file-contents tmpfile))
(when display (display-buffer outbuf)))
;; Remove output file.
(delete-file (tramp-make-tramp-file-name method user host output)))
(with-parsed-tramp-file-name (car args) nil
(tramp-set-connection-property v "started" t))
nil))
+ ;; If the second argument of `copy-file' or `rename-file' is a
+ ;; remote file name but via FTP, ange-ftp doesn't check this.
+ ;; We must copy it locally first, because there is no place in
+ ;; ange-ftp for correct handling.
+ ((and (memq operation '(copy-file rename-file))
+ (file-remote-p (cadr args))
+ (not (tramp-ftp-file-name-p (cadr args))))
+ (let* ((filename (car args))
+ (newname (cadr args))
+ (tmpfile (tramp-make-temp-file filename))
+ (args (cddr args)))
+ (apply operation filename tmpfile args)
+ (rename-file tmpfile newname (car args))))
;; Normally, the handlers must be discarded.
(t (let* ((inhibit-file-name-handlers
(list 'tramp-file-name-handler
(require 'tramp-cache)
(require 'tramp-compat)
-;; Pacify byte-compiler
-(eval-when-compile
- (require 'cl)
- (require 'custom))
-
;; Define SMB method ...
(defcustom tramp-smb-method "smb"
"*Method to connect SAMBA and M$ SMB servers."
"Like `file-local-copy' for Tramp files."
(with-parsed-tramp-file-name filename nil
(let ((file (tramp-smb-get-localname localname t))
- (tmpfil (tramp-make-temp-file filename)))
+ (tmpfile (tramp-make-temp-file filename)))
(unless (file-exists-p filename)
(tramp-error
v 'file-error
"Cannot make local copy of non-existing file `%s'" filename))
- (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfil)
- (if (tramp-smb-send-command v (format "get \"%s\" %s" file tmpfil))
+ (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile)
+ (if (tramp-smb-send-command v (format "get \"%s\" %s" file tmpfile))
(tramp-message
- v 4 "Fetching %s to tmp file %s...done" filename tmpfil)
+ v 4 "Fetching %s to tmp file %s...done" filename tmpfile)
(tramp-error
v 'file-error
"Cannot make local copy of file `%s'" filename))
- tmpfil)))
+ tmpfile)))
;; This function should return "foo/" for directories and "bar" for
;; files.
(unless (eq append nil)
(tramp-error
v 'file-error "Cannot append to file using tramp (`%s')" filename))
- ;; XEmacs takes a coding system as the seventh argument, not `confirm'
+ ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
(when (and (not (featurep 'xemacs))
confirm (file-exists-p filename))
(unless (y-or-n-p (format "File %s exists; overwrite anyway? "
(tramp-flush-file-property v localname)
(let ((file (tramp-smb-get-localname localname t))
(curbuf (current-buffer))
- tmpfil)
- ;; Write region into a tmp file.
- (setq tmpfil (tramp-make-temp-file filename))
+ (tmpfile (tramp-make-temp-file filename)))
;; We say `no-message' here because we don't want the visited file
;; modtime data to be clobbered from the temp file. We call
;; `set-visited-file-modtime' ourselves later on.
(tramp-run-real-handler
'write-region
(if confirm ; don't pass this arg unless defined for backward compat.
- (list start end tmpfil append 'no-message lockname confirm)
- (list start end tmpfil append 'no-message lockname)))
+ (list start end tmpfile append 'no-message lockname confirm)
+ (list start end tmpfile append 'no-message lockname)))
- (tramp-message v 5 "Writing tmp file %s to file %s..." tmpfil filename)
- (if (tramp-smb-send-command v (format "put %s \"%s\"" tmpfil file))
+ (tramp-message v 5 "Writing tmp file %s to file %s..." tmpfile filename)
+ (if (tramp-smb-send-command v (format "put %s \"%s\"" tmpfile file))
(tramp-message
- v 5 "Writing tmp file %s to file %s...done" tmpfil filename)
+ v 5 "Writing tmp file %s to file %s...done" tmpfile filename)
(tramp-error v 'file-error "Cannot write `%s'" filename))
- (delete-file tmpfil)
+ (delete-file tmpfile)
(unless (equal curbuf (current-buffer))
(tramp-error
v 'file-error
(unload-feature 'trampver 'force))))
(require 'tramp-compat)
-
-;; `directory-sep-char' is an obsolete variable in Emacs. But it is
-;; used in XEmacs, so we set it here and there. The following is needed
-;; to pacify Emacs byte-compiler.
-(eval-when-compile
- (setq byte-compile-not-obsolete-var 'directory-sep-char))
-
-(require 'custom)
-
-(if (featurep 'xemacs)
- (require 'timer-funcs)
- (require 'timer))
+(add-hook 'tramp-unload-hook
+ '(lambda ()
+ (when (featurep 'tramp-compat)
+ (unload-feature 'tramp-compat 'force))))
(require 'format-spec) ;from Gnus 5.8, also in tar ball
;; As long as password.el is not part of (X)Emacs, it shouldn't
:version "22.1")
(defcustom tramp-verbose 3
- "*Verbosity level for tramp.
+ "*Verbosity level for Tramp.
Any level x includes messages for all levels 1 .. x-1. The levels are
0 silent (no tramp messages at all)
((equal tramp-syntax 'sep) tramp-file-name-regexp-separate)
((equal tramp-syntax 'url) tramp-file-name-regexp-url)
(t (error "Wrong `tramp-syntax' defined")))
- "*Regular expression matching file names handled by tramp.
+ "*Regular expression matching file names handled by Tramp.
This regexp should match tramp file names but no other file names.
\(When tramp.el is loaded, this regular expression is prepended to
`file-name-handler-alist', and that is searched sequentially. Thus,
(file-local-copy . tramp-handle-file-local-copy)
(file-remote-p . tramp-handle-file-remote-p)
(insert-file-contents . tramp-handle-insert-file-contents)
+ (insert-file-contents-literally
+ . tramp-handle-insert-file-contents-literally)
(write-region . tramp-handle-write-region)
(find-backup-file-name . tramp-handle-find-backup-file-name)
(make-auto-save-file-name . tramp-handle-make-auto-save-file-name)
(defsubst tramp-make-temp-file (filename)
(concat
- (funcall (if (fboundp 'make-temp-file) 'make-temp-file 'make-temp-name)
- (expand-file-name tramp-temp-name-prefix
- (tramp-compat-temporary-file-directory)))
+ (make-temp-name
+ (expand-file-name
+ tramp-temp-name-prefix (tramp-compat-temporary-file-directory)))
(file-name-extension filename t)))
(defsubst tramp-make-tramp-temp-file (vec)
(t2
(tramp-send-command
v (format
- "%s %s %s" cmd
+ "mv -f %s %s"
(tramp-shell-quote-argument tmpfile)
(tramp-shell-quote-argument localname2))))
(t1
- (if (eq op 'copy)
- (tramp-compat-copy-file
- tmpfile localname2 ok-if-already-exists
- keep-date preserve-uid-gid)
- (rename-file tmpfile localname2 ok-if-already-exists))))
-
- ;; Remove temporary file.
- (when (eq op 'copy) (delete-file tmpfile)))))))
+ (rename-file tmpfile localname2 ok-if-already-exists))))))))
;; Set the time and mode. Mask possible errors.
;; Won't be applied for 'rename.
(with-parsed-tramp-file-name filename nil
(let ((rem-enc (tramp-get-remote-coding v "remote-encoding"))
(loc-dec (tramp-get-local-coding v "local-decoding"))
- (tmpfil (tramp-make-temp-file filename)))
+ (tmpfile (tramp-make-temp-file filename)))
(unless (file-exists-p filename)
(tramp-error
v 'file-error
((or (tramp-local-host-p v)
(and (tramp-method-out-of-band-p v)
(> (nth 7 (file-attributes filename)) tramp-copy-size-limit)))
- (copy-file filename tmpfil t t))
+ (copy-file filename tmpfile t t))
;; Use inline encoding for file transfer.
(rem-enc
filename loc-dec)
(funcall loc-dec (point-min) (point-max))
(let ((coding-system-for-write 'binary))
- (write-region (point-min) (point-max) tmpfil))))
+ (write-region (point-min) (point-max) tmpfile))))
;; If tramp-decoding-function is not defined for this
;; method, we invoke tramp-decoding-command instead.
- (let ((tmpfil2 (tramp-make-temp-file filename)))
+ (let ((tmpfile2 (tramp-make-temp-file filename)))
(let ((coding-system-for-write 'binary))
- (write-region (point-min) (point-max) tmpfil2))
+ (write-region (point-min) (point-max) tmpfile2))
(tramp-message
v 5 "Decoding remote file %s with command %s..."
filename loc-dec)
- (tramp-call-local-coding-command loc-dec tmpfil2 tmpfil)
- (delete-file tmpfil2)))
+ (tramp-call-local-coding-command loc-dec tmpfile2 tmpfile)
+ (delete-file tmpfile2)))
(tramp-message v 5 "Decoding remote file %s...done" filename)
;; Set proper permissions.
- (set-file-modes tmpfil (file-modes filename))
+ (set-file-modes tmpfile (file-modes filename))
;; Set local user ownership.
- (tramp-set-file-uid-gid tmpfil)))
+ (tramp-set-file-uid-gid tmpfile)))
;; Oops, I don't know what to do.
(t (tramp-error
v 'file-error "Wrong method specification for `%s'" method)))
(run-hooks 'tramp-handle-file-local-copy-hook)
- tmpfil)))
+ tmpfile)))
(defun tramp-handle-file-remote-p (filename &optional identification connected)
"Like `file-remote-p' for Tramp files."
(if (and (tramp-local-host-p v)
(file-readable-p localname))
;; Short track: if we are on the local host, we can run directly.
- (insert-file-contents localname visit beg end replace)
+ (setq result (insert-file-contents localname visit beg end replace))
;; `insert-file-contents-literally' takes care to avoid calling
;; jka-compr. By let-binding inhibit-file-name-operation, we
(list (expand-file-name filename)
(cadr result))))))
+;; This is needed for XEmacs only. Code stolen from files.el.
+(defun tramp-handle-insert-file-contents-literally
+ (filename &optional visit beg end replace)
+ "Like `insert-file-contents-literally' for Tramp files."
+ (let ((format-alist nil)
+ (after-insert-file-functions nil)
+ (coding-system-for-read 'no-conversion)
+ (coding-system-for-write 'no-conversion)
+ (find-buffer-file-type-function
+ (if (fboundp 'find-buffer-file-type)
+ (symbol-function 'find-buffer-file-type)
+ nil))
+ (inhibit-file-name-handlers '(jka-compr-handler image-file-handler))
+ (inhibit-file-name-operation 'insert-file-contents))
+ (unwind-protect
+ (progn
+ (fset 'find-buffer-file-type (lambda (filename) t))
+ (insert-file-contents filename visit beg end replace))
+ (if find-buffer-file-type-function
+ (fset 'find-buffer-file-type find-buffer-file-type-function)
+ (fmakunbound 'find-buffer-file-type)))))
+
(defun tramp-handle-find-backup-file-name (filename)
"Like `find-backup-file-name' for Tramp files."
(with-parsed-tramp-file-name filename nil
;; (error
;; "tramp-handle-write-region: LOCKNAME must be nil or equal FILENAME"))
- ;; XEmacs takes a coding system as the seventh argument, not `confirm'
+ ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
(when (and (not (featurep 'xemacs)) confirm (file-exists-p filename))
(unless (y-or-n-p (format "File %s exists; overwrite anyway? " filename))
(tramp-error v 'file-error "File not overwritten")))
;; Write region into a tmp file. This isn't really needed if we
;; use an encoding function, but currently we use it always
;; because this makes the logic simpler.
- (tmpfil (tramp-make-temp-file filename)))
+ (tmpfile (tramp-make-temp-file filename)))
(if (and (tramp-local-host-p v)
(file-writable-p (file-name-directory localname)))
(tramp-run-real-handler
'write-region
(if confirm ; don't pass this arg unless defined for backward compat.
- (list start end tmpfil append 'no-message lockname confirm)
- (list start end tmpfil append 'no-message lockname)))
+ (list start end tmpfile append 'no-message lockname confirm)
+ (list start end tmpfile append 'no-message lockname)))
;; Now, `last-coding-system-used' has the right value. Remember it.
(when (boundp 'last-coding-system-used)
(setq coding-system-used (symbol-value 'last-coding-system-used)))
;; filename does not exist (eq modes nil) it has been renamed to
;; the backup file. This case `save-buffer' handles
;; permissions.
- (when modes (set-file-modes tmpfil modes))
+ (when modes (set-file-modes tmpfile modes))
;; This is a bit lengthy due to the different methods possible for
;; file transfer. First, we check whether the method uses an rcp
(and (tramp-method-out-of-band-p v)
(integerp start)
(> (- end start) tramp-copy-size-limit)))
- (rename-file tmpfil filename t))
+ (rename-file tmpfile filename t))
;; Use inline file transfer
(rem-dec
- ;; Encode tmpfil
+ ;; Encode tmpfile
(tramp-message v 5 "Encoding region...")
(unwind-protect
(with-temp-buffer
v 5 "Encoding region using function `%s'..."
(symbol-name loc-enc))
(let ((coding-system-for-read 'binary))
- (insert-file-contents-literally tmpfil))
+ (insert-file-contents-literally tmpfile))
;; CCC. The following `let' is a workaround for
;; the base64.el that comes with pgnus-0.84. If
;; both of the following conditions are
(tramp-message
v 5 "Encoding region using command `%s'..." loc-enc)
(unless (equal 0 (tramp-call-local-coding-command
- loc-enc tmpfil t))
+ loc-enc tmpfile t))
(tramp-error
v 'file-error
"Cannot write to `%s', local encoding command `%s' failed"
filename rem-dec)
;; When `file-precious-flag' is set, the region is
;; written to a temporary file. Check that the
- ;; checksum is equal to that from the local tmpfil.
+ ;; checksum is equal to that from the local tmpfile.
(when file-precious-flag
(erase-buffer)
(and
;; cksum runs locally
(let ((default-directory
(tramp-compat-temporary-file-directory)))
- (zerop (call-process "cksum" tmpfil t)))
+ (zerop (call-process "cksum" tmpfile t)))
;; cksum runs remotely
(zerop
(tramp-send-command-and-check
(tramp-flush-file-property v localname))
;; Save exit.
- (delete-file tmpfil)))
+ (delete-file tmpfile)))
;; That's not expected.
(t
"Checks whether method / user name / host name completion is active."
(or
;; Emacs
- (not (memq last-input-event '(return newline)))
+ (equal last-input-event 'tab)
(and (natnump last-input-event)
- (not (char-equal last-input-event ?\n))
- (not (char-equal last-input-event ?\r)))
+ (or
+ ;; ?\t has event-modifier 'control
+ (char-equal last-input-event ?\t)
+ (and (not (event-modifiers last-input-event))
+ (or (char-equal last-input-event ?\?)
+ (char-equal last-input-event ?\ )))))
;; XEmacs
(and (featurep 'xemacs)
;; `last-input-event' might be nil.
(not (null last-input-event))
;; `last-input-event' may have no character approximation.
(funcall (symbol-function 'event-to-character) last-input-event)
- (not (char-equal
- (funcall (symbol-function 'event-to-character)
- last-input-event) ?\n))
- (not (char-equal
- (funcall (symbol-function 'event-to-character)
- last-input-event) ?\r)))))
+ (or
+ ;; ?\t has event-modifier 'control
+ (char-equal
+ (funcall (symbol-function 'event-to-character)
+ last-input-event) ?\t)
+ (and (not (event-modifiers last-input-event))
+ (or (char-equal
+ (funcall (symbol-function 'event-to-character)
+ last-input-event) ?\?)
+ (char-equal
+ (funcall (symbol-function 'event-to-character)
+ last-input-event) ?\ )))))))
;; Method, host name and user name completion.
;; `tramp-completion-dissect-file-name' returns a list of
(tramp-equal-remote \"/sudo::/etc\" \"/su::/etc\")"
(and (stringp (file-remote-p file1))
(stringp (file-remote-p file2))
- (string-equal (file-remote-p file1)
- (file-remote-p file2))))
+ (string-equal (file-remote-p file1) (file-remote-p file2))))
(defun tramp-make-tramp-file-name (method user host localname)
"Constructs a Tramp file name from METHOD, USER, HOST and LOCALNAME."
If you can give a simple set of instructions to make this bug
happen reliably, please include those. Thank you for helping
-kill bugs in TRAMP.
+kill bugs in Tramp.
Another useful thing to do is to put
projects / emacs.git / commitdiff