diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:44:48 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:44:48 -0800 |
commit | f9094332287cf1434788f6407347265350ae5dd5 (patch) | |
tree | dd0405f108e95f376d8b2927666de63135dd5594 /lisp/net/tramp-sudoedit.el | |
parent | bb2b857d1f03516e0923f3f4e18f5459fdfcf692 (diff) | |
parent | 448df8fec7a7fb3fe558749591e657e8a84cb46b (diff) | |
download | emacs-f9094332287cf1434788f6407347265350ae5dd5.tar.gz emacs-f9094332287cf1434788f6407347265350ae5dd5.tar.bz2 emacs-f9094332287cf1434788f6407347265350ae5dd5.zip |
Merge from origin/emacs-27
448df8fec7 Improve doc-strings of 'quit-window' and 'quit-restore-win...
7f01dfca56 Fix MH-E bug #470: Show buffer discards text properties
f95a2b8301 Fix some broken conditional forms
28727444f1 Fix a scoping error in tramp-sudoedit.el
6cbdd048bd * lisp/autorevert.el (auto-revert-notify-handler): Fix bra...
076dd1f69a Fix typo in 'window_box_height'
Diffstat (limited to 'lisp/net/tramp-sudoedit.el')
-rw-r--r-- | lisp/net/tramp-sudoedit.el | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el index 18b30ad1f4e..08188cefde3 100644 --- a/lisp/net/tramp-sudoedit.el +++ b/lisp/net/tramp-sudoedit.el @@ -508,21 +508,21 @@ the result will be a local, non-Tramp, file name." (tramp-message v 5 "file system info: %s" localname) (when (tramp-sudoedit-send-command v "df" "--block-size=1" "--output=size,used,avail" - (tramp-compat-file-name-unquote localname))) - (with-current-buffer (tramp-get-connection-buffer v) - (goto-char (point-min)) - (forward-line) - (when (looking-at - (eval-when-compile - (concat "[[:space:]]*\\([[:digit:]]+\\)" - "[[:space:]]+\\([[:digit:]]+\\)" - "[[:space:]]+\\([[:digit:]]+\\)"))) - (list (string-to-number (match-string 1)) - ;; The second value is the used size. We need the - ;; free size. - (- (string-to-number (match-string 1)) - (string-to-number (match-string 2))) - (string-to-number (match-string 3)))))))) + (tramp-compat-file-name-unquote localname)) + (with-current-buffer (tramp-get-connection-buffer v) + (goto-char (point-min)) + (forward-line) + (when (looking-at + (eval-when-compile + (concat "[[:space:]]*\\([[:digit:]]+\\)" + "[[:space:]]+\\([[:digit:]]+\\)" + "[[:space:]]+\\([[:digit:]]+\\)"))) + (list (string-to-number (match-string 1)) + ;; The second value is the used size. We need the + ;; free size. + (- (string-to-number (match-string 1)) + (string-to-number (match-string 2))) + (string-to-number (match-string 3))))))))) (defun tramp-sudoedit-handle-set-file-times (filename &optional time) "Like `set-file-times' for Tramp files." |