mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-08 20:58:58 +00:00
Code Issues Releases Activity

Make Tramp compatible to recent progress-reporter-update

Browse Source 
* lisp/net/tramp-compat.el (tramp-compat-progress-reporter-update):
New defalias.

* lisp/net/tramp.el (tramp-progress-reporter-update): Add optional SUFFIX.
This commit is contained in:
Michael Albinus 2019-06-15 11:38:13 +02:00
parent 38a86a4c49
commit 55cdebcf63
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/net/tramp-compat.el
View File

@ -290,6 +290,14 @@ A nil value for either argument stands for the current time."
tree)) tree))
(nreverse elems))))) (nreverse elems)))))
;; `progress-reporter-update' got argument SUFFIX in Emacs 27.1.
(defalias 'tramp-compat-progress-reporter-update
(if (equal (tramp-compat-funcall 'func-arity #'progress-reporter-update)
'(1 . 3))
#'progress-reporter-update
(lambda (reporter &optional value _suffix)
(progress-reporter-update reporter value))))
(add-hook 'tramp-unload-hook (add-hook 'tramp-unload-hook
(lambda () (lambda ()
(unload-feature 'tramp-loaddefs 'force) (unload-feature 'tramp-loaddefs 'force)

4
lisp/net/tramp.el
View File

@ -1928,12 +1928,12 @@ If VAR is nil, then we bind `v' to the structure and `method', `user',
(put 'with-parsed-tramp-file-name 'edebug-form-spec '(form symbolp body)) (put 'with-parsed-tramp-file-name 'edebug-form-spec '(form symbolp body))
(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>")) (font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>"))
(defun tramp-progress-reporter-update (reporter &optional value) (defun tramp-progress-reporter-update (reporter &optional value suffix)
"Report progress of an operation for Tramp." "Report progress of an operation for Tramp."
(let* ((parameters (cdr reporter)) (let* ((parameters (cdr reporter))
(message (aref parameters 3))) (message (aref parameters 3)))
(when (string-match-p message (or (current-message) "")) (when (string-match-p message (or (current-message) ""))
(progress-reporter-update reporter value)))) (tramp-compat-progress-reporter-update reporter value suffix))))
(defmacro with-tramp-progress-reporter (vec level message &rest body) (defmacro with-tramp-progress-reporter (vec level message &rest body)
"Executes BODY, spinning a progress reporter with MESSAGE. "Executes BODY, spinning a progress reporter with MESSAGE.