From b0370a89f6dd57b95be30b8218e17c12d886c27a Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 4 May 2017 12:21:32 +0200 Subject: [PATCH] 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'. --- lisp/net/tramp-adb.el | 2 ++ lisp/net/tramp-gvfs.el | 1 + lisp/net/tramp-sh.el | 2 ++ lisp/net/tramp-smb.el | 4 ++++ 4 files changed, 9 insertions(+) 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." tramp-current-host nil nil)) result) (tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " ")) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) (while (tramp-compat-process-live-p p) (accept-process-output p 0.1)) @@ -1230,6 +1231,7 @@ connection if a previous connection has died for some reason." (unless (tramp-compat-process-live-p p) (tramp-error vec 'file-error "Terminated!")) (tramp-set-connection-property p "vector" vec) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) ;; 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." (tramp-set-connection-property p "vector" v) (process-put p 'events events) (process-put p 'watch-name localname) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) (set-process-filter p 'tramp-gvfs-monitor-file-process-filter) ;; 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." command)))) (tramp-message orig-vec 6 "%s" command) (tramp-set-connection-property p "vector" orig-vec) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) ;; We must adapt `tramp-local-end-of-line' for @@ -4719,6 +4720,7 @@ connection if a previous connection has died for some reason." ;; Set sentinel and query flag. (tramp-set-connection-property p "vector" vec) (set-process-sentinel p 'tramp-process-sentinel) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) (setq tramp-current-connection (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." (tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " ")) (tramp-set-connection-property p "vector" v) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) (tramp-process-actions p v nil tramp-smb-actions-with-tar) @@ -788,6 +789,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " ")) (tramp-set-connection-property p "vector" v) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) (tramp-process-actions p v nil tramp-smb-actions-get-acl) (when (> (point-max) (point-min)) @@ -1384,6 +1386,7 @@ target of the symlink differ." (tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " ")) (tramp-set-connection-property p "vector" v) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) (tramp-process-actions p v nil tramp-smb-actions-set-acl) (goto-char (point-max)) @@ -1890,6 +1893,7 @@ If ARGUMENT is non-nil, use it as argument for (tramp-message vec 6 "%s" (mapconcat 'identity (process-command p) " ")) (tramp-set-connection-property p "vector" vec) + (process-put p 'adjust-window-size-function 'ignore) (set-process-query-on-exit-flag p nil) ;; Set variables for computing the prompt for reading password. -- 2.39.5