diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-adb.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 3 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 3 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 3 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 21 |
6 files changed, 6 insertions, 31 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 7b8b3fc8809..ecb60e5a4f4 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3284,10 +3284,7 @@ system TYPE.") (set-buffer-modified-p nil))) ;; ensure `last-coding-system-used' has an appropriate value (setq last-coding-system-used coding-system-used) - (ange-ftp-message "Wrote `%s' (%d characters)" abbr - (cond ((null start) (buffer-size)) - ((stringp start) (length start)) - (t (- end start)))) + (ange-ftp-message "Wrote %s" abbr) (ange-ftp-add-file-entry filename)) (ange-ftp-real-write-region start end filename append visit)))) diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 8bbdca795e8..2825532c525 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -652,8 +652,6 @@ But handle the case, if the \"test\" command is not available." (when (or (eq visit t) (stringp visit)) (set-visited-file-modtime)) - (tramp-handle-write-region-message v start end filename append visit) - (unless (equal curbuf (current-buffer)) (tramp-error v 'file-error diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 55fddf3dbd8..cf3906aef36 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -1224,7 +1224,8 @@ file-notify events." (file-attributes filename)))) ;; The end. - (tramp-handle-write-region-message v start end filename append visit) + (when (or (eq visit t) (null visit) (stringp visit)) + (tramp-message v 0 "Wrote %s" filename)) (run-hooks 'tramp-handle-write-region-hook))) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index adadf9650e6..e61b0ce526a 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3412,7 +3412,8 @@ the result will be a local, non-Tramp, file name." ;; Set the ownership. (when need-chown (tramp-set-file-uid-gid filename uid gid)) - (tramp-handle-write-region-message v start end filename append visit) + (when (or (eq visit t) (null visit) (stringp visit)) + (tramp-message v 0 "Wrote %s" filename)) (run-hooks 'tramp-handle-write-region-hook))))) (defvar tramp-vc-registered-file-names nil diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 4b288e199af..12eb3679513 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -1521,8 +1521,7 @@ errors for shares like \"C$/\", which are common in Microsoft Windows." v 'file-error "Buffer has changed from `%s' to `%s'" curbuf (current-buffer))) (when (eq visit t) - (set-visited-file-modtime)) - (tramp-handle-write-region-message v start end filename append visit)))) + (set-visited-file-modtime))))) ;; Internal file name functions. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 4a1900c6f8a..071114a0157 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2753,27 +2753,6 @@ User is always nil." (defvar tramp-handle-write-region-hook nil "Normal hook to be run at the end of `tramp-*-handle-write-region'.") -(defsubst tramp-handle-write-region-message - (vec start end filename &optional append visit) - "Message to be written for `tramp-*-handle-write-region'" - ;; We shall also don't write when autosaving. How to check? - (when (and (null noninteractive) - (or (eq visit t) (null visit) (stringp visit))) - (let ((nchars (cond ((null start) (buffer-size)) - ((stringp start) (length start)) - (t (- end start))))) - (tramp-message - vec 0 "%s `%s'%s" - (cond - ((numberp append) "Updated") - (append "Added to") - (t "Wrote")) - filename - (cond - ((null (bound-and-true-p write-region-verbose)) "") - ((= nchars 1) " (1 character)") - (t (format " (%d characters)" nchars))))))) - (defun tramp-handle-directory-file-name (directory) "Like `directory-file-name' for Tramp files." ;; If localname component of filename is "/", leave it unchanged. |