diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-06-02 00:48:23 -0300 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-06-02 00:48:23 -0300 |
| commit | 7d5200893a8cc980744bb4c65355df5a936388bb (patch) | |
| tree | 936f771391b10855e544e0f3a178ac25ecaf1b4e /lisp/net/tramp-smb.el | |
| parent | a1c2400f272533e9f5cefa8ce59732c355950fd8 (diff) | |
| download | emacs-7d5200893a8cc980744bb4c65355df5a936388bb.tar.gz emacs-7d5200893a8cc980744bb4c65355df5a936388bb.tar.bz2 emacs-7d5200893a8cc980744bb4c65355df5a936388bb.zip | |
* lisp/net/tramp.el (tramp-with-progress-reporter): Rename from
with-progress-reporter. Use `declare'.
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-gvfs.el: Update all uses.
Diffstat (limited to 'lisp/net/tramp-smb.el')
| -rw-r--r-- | lisp/net/tramp-smb.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 5a62b71bda1..a43e99c1206 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -342,7 +342,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server. PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored." (setq filename (expand-file-name filename) newname (expand-file-name newname)) - (with-progress-reporter + (tramp-with-progress-reporter (tramp-dissect-file-name (if (file-remote-p filename) filename newname)) 0 (format "Copying %s to %s" filename newname) @@ -600,7 +600,7 @@ PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored." v 'file-error "Cannot make local copy of non-existing file `%s'" filename)) (let ((tmpfile (tramp-compat-make-temp-file filename))) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Fetching %s to tmp file %s" filename tmpfile) (unless (tramp-smb-send-command v (format "get \"%s\" \"%s\"" @@ -837,7 +837,7 @@ target of the symlink differ." "Like `rename-file' for Tramp files." (setq filename (expand-file-name filename) newname (expand-file-name newname)) - (with-progress-reporter + (tramp-with-progress-reporter (tramp-dissect-file-name (if (file-remote-p filename) filename newname)) 0 (format "Renaming %s to %s" filename newname) @@ -926,7 +926,7 @@ errors for shares like \"C$/\", which are common in Microsoft Windows." (list start end tmpfile append 'no-message lockname confirm) (list start end tmpfile append 'no-message lockname))) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Moving tmp file %s to %s" tmpfile filename) (unwind-protect (unless (tramp-smb-send-command @@ -1289,7 +1289,7 @@ connection if a previous connection has died for some reason." (setq args (append args (list "-s" tramp-smb-conf)))) ;; OK, let's go. - (with-progress-reporter + (tramp-with-progress-reporter vec 3 (format "Opening connection for //%s%s/%s" (if (not (zerop (length user))) (concat user "@") "") |