diff options
| author | Michael Albinus | 2017-05-04 12:21:32 +0200 |
|---|---|---|
| committer | Michael Albinus | 2017-05-04 12:21:32 +0200 |
| commit | b0370a89f6dd57b95be30b8218e17c12d886c27a (patch) | |
| tree | 180961604225644bf8442c151178ea04e5e69e92 | |
| parent | 5c4dbbb745f31fda95843bbc6d2fd070b9473c65 (diff) | |
| download | emacs-b0370a89f6dd57b95be30b8218e17c12d886c27a.tar.gz emacs-b0370a89f6dd57b95be30b8218e17c12d886c27a.zip | |
Set process property `adjust-window-size-function' to `ignore' in Tramp
* lisp/net/tramp-adb.el (tramp-adb-parse-device-names)
(tramp-adb-maybe-open-connection):
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-file-acl, tramp-smb-handle-set-file-acl)
(tramp-smb-maybe-open-connection): Set process property
`adjust-window-size-function' to `ignore'.
| -rw-r--r-- | lisp/net/tramp-adb.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 1 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 4 |
4 files changed, 9 insertions, 0 deletions
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index a80bc0bdb2a..2825532c525 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el | |||
| @@ -203,6 +203,7 @@ pass to the OPERATION." | |||
| 203 | tramp-current-host nil nil)) | 203 | tramp-current-host nil nil)) |
| 204 | result) | 204 | result) |
| 205 | (tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " ")) | 205 | (tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " ")) |
| 206 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 206 | (set-process-query-on-exit-flag p nil) | 207 | (set-process-query-on-exit-flag p nil) |
| 207 | (while (tramp-compat-process-live-p p) | 208 | (while (tramp-compat-process-live-p p) |
| 208 | (accept-process-output p 0.1)) | 209 | (accept-process-output p 0.1)) |
| @@ -1230,6 +1231,7 @@ connection if a previous connection has died for some reason." | |||
| 1230 | (unless (tramp-compat-process-live-p p) | 1231 | (unless (tramp-compat-process-live-p p) |
| 1231 | (tramp-error vec 'file-error "Terminated!")) | 1232 | (tramp-error vec 'file-error "Terminated!")) |
| 1232 | (tramp-set-connection-property p "vector" vec) | 1233 | (tramp-set-connection-property p "vector" vec) |
| 1234 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 1233 | (set-process-query-on-exit-flag p nil) | 1235 | (set-process-query-on-exit-flag p nil) |
| 1234 | 1236 | ||
| 1235 | ;; Check whether the properties have been changed. If | 1237 | ;; Check whether the properties have been changed. If |
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 593be33e833..aba6f414a45 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el | |||
| @@ -1082,6 +1082,7 @@ file names." | |||
| 1082 | (tramp-set-connection-property p "vector" v) | 1082 | (tramp-set-connection-property p "vector" v) |
| 1083 | (process-put p 'events events) | 1083 | (process-put p 'events events) |
| 1084 | (process-put p 'watch-name localname) | 1084 | (process-put p 'watch-name localname) |
| 1085 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 1085 | (set-process-query-on-exit-flag p nil) | 1086 | (set-process-query-on-exit-flag p nil) |
| 1086 | (set-process-filter p 'tramp-gvfs-monitor-file-process-filter) | 1087 | (set-process-filter p 'tramp-gvfs-monitor-file-process-filter) |
| 1087 | ;; There might be an error if the monitor is not supported. | 1088 | ;; There might be an error if the monitor is not supported. |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 71afb9aeb75..971cdaedf82 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -2517,6 +2517,7 @@ The method used must be an out-of-band method." | |||
| 2517 | command)))) | 2517 | command)))) |
| 2518 | (tramp-message orig-vec 6 "%s" command) | 2518 | (tramp-message orig-vec 6 "%s" command) |
| 2519 | (tramp-set-connection-property p "vector" orig-vec) | 2519 | (tramp-set-connection-property p "vector" orig-vec) |
| 2520 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 2520 | (set-process-query-on-exit-flag p nil) | 2521 | (set-process-query-on-exit-flag p nil) |
| 2521 | 2522 | ||
| 2522 | ;; We must adapt `tramp-local-end-of-line' for | 2523 | ;; We must adapt `tramp-local-end-of-line' for |
| @@ -4719,6 +4720,7 @@ connection if a previous connection has died for some reason." | |||
| 4719 | ;; Set sentinel and query flag. | 4720 | ;; Set sentinel and query flag. |
| 4720 | (tramp-set-connection-property p "vector" vec) | 4721 | (tramp-set-connection-property p "vector" vec) |
| 4721 | (set-process-sentinel p 'tramp-process-sentinel) | 4722 | (set-process-sentinel p 'tramp-process-sentinel) |
| 4723 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 4722 | (set-process-query-on-exit-flag p nil) | 4724 | (set-process-query-on-exit-flag p nil) |
| 4723 | (setq tramp-current-connection | 4725 | (setq tramp-current-connection |
| 4724 | (cons (butlast (append vec nil) 2) (current-time)) | 4726 | (cons (butlast (append vec nil) 2) (current-time)) |
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 014e1e86011..5a3e2566d71 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -526,6 +526,7 @@ pass to the OPERATION." | |||
| 526 | (tramp-message | 526 | (tramp-message |
| 527 | v 6 "%s" (mapconcat 'identity (process-command p) " ")) | 527 | v 6 "%s" (mapconcat 'identity (process-command p) " ")) |
| 528 | (tramp-set-connection-property p "vector" v) | 528 | (tramp-set-connection-property p "vector" v) |
| 529 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 529 | (set-process-query-on-exit-flag p nil) | 530 | (set-process-query-on-exit-flag p nil) |
| 530 | (tramp-process-actions p v nil tramp-smb-actions-with-tar) | 531 | (tramp-process-actions p v nil tramp-smb-actions-with-tar) |
| 531 | 532 | ||
| @@ -788,6 +789,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 788 | (tramp-message | 789 | (tramp-message |
| 789 | v 6 "%s" (mapconcat 'identity (process-command p) " ")) | 790 | v 6 "%s" (mapconcat 'identity (process-command p) " ")) |
| 790 | (tramp-set-connection-property p "vector" v) | 791 | (tramp-set-connection-property p "vector" v) |
| 792 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 791 | (set-process-query-on-exit-flag p nil) | 793 | (set-process-query-on-exit-flag p nil) |
| 792 | (tramp-process-actions p v nil tramp-smb-actions-get-acl) | 794 | (tramp-process-actions p v nil tramp-smb-actions-get-acl) |
| 793 | (when (> (point-max) (point-min)) | 795 | (when (> (point-max) (point-min)) |
| @@ -1384,6 +1386,7 @@ target of the symlink differ." | |||
| 1384 | (tramp-message | 1386 | (tramp-message |
| 1385 | v 6 "%s" (mapconcat 'identity (process-command p) " ")) | 1387 | v 6 "%s" (mapconcat 'identity (process-command p) " ")) |
| 1386 | (tramp-set-connection-property p "vector" v) | 1388 | (tramp-set-connection-property p "vector" v) |
| 1389 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 1387 | (set-process-query-on-exit-flag p nil) | 1390 | (set-process-query-on-exit-flag p nil) |
| 1388 | (tramp-process-actions p v nil tramp-smb-actions-set-acl) | 1391 | (tramp-process-actions p v nil tramp-smb-actions-set-acl) |
| 1389 | (goto-char (point-max)) | 1392 | (goto-char (point-max)) |
| @@ -1890,6 +1893,7 @@ If ARGUMENT is non-nil, use it as argument for | |||
| 1890 | (tramp-message | 1893 | (tramp-message |
| 1891 | vec 6 "%s" (mapconcat 'identity (process-command p) " ")) | 1894 | vec 6 "%s" (mapconcat 'identity (process-command p) " ")) |
| 1892 | (tramp-set-connection-property p "vector" vec) | 1895 | (tramp-set-connection-property p "vector" vec) |
| 1896 | (process-put p 'adjust-window-size-function 'ignore) | ||
| 1893 | (set-process-query-on-exit-flag p nil) | 1897 | (set-process-query-on-exit-flag p nil) |
| 1894 | 1898 | ||
| 1895 | ;; Set variables for computing the prompt for reading password. | 1899 | ;; Set variables for computing the prompt for reading password. |