From df9b56ecff43b64f39e98ab118fe9a0f299882c4 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sun, 5 May 2019 22:27:33 +0300 Subject: [PATCH] Rename shell-command-width to async-shell-command-width (bug#35055) * lisp/simple.el (async-shell-command-width): * lisp/net/tramp.el (tramp-handle-shell-command): * test/lisp/net/tramp-tests.el (tramp-test32-shell-command): * doc/misc/tramp.texi (Remote processes): Rename this variable. * doc/emacs/misc.texi (Single Shell): Add async-shell-command-width. --- doc/emacs/misc.texi | 7 +++++++ doc/misc/tramp.texi | 4 ++-- etc/NEWS | 4 ++-- lisp/net/tramp.el | 6 +++--- lisp/simple.el | 6 +++--- test/lisp/net/tramp-tests.el | 9 ++++----- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 7d7065a441a..5f743927367 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -775,6 +775,13 @@ documentation for more possibilities. displayed only when the command generates output, set @code{async-shell-command-display-buffer} to @code{nil}. +@vindex async-shell-command-width + The option @code{async-shell-command-width} defines the number of display +columns available for output of asynchronous shell commands. +A positive integer tells the shell to use that number of columns for +command output. The default value is @code{nil} that means to use +the same number of columns as provided by the shell. + @kindex M-| @findex shell-command-on-region @kbd{M-|} (@code{shell-command-on-region}) is like @kbd{M-!}, but diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 0c51f15fbb9..2eb5b45eb2a 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3093,9 +3093,9 @@ uses @file{/system/bin/sh}). Like the variables in the previous section, these variables can be changed via connection-local variables. -@vindex shell-command-width +@vindex async-shell-command-width @vindex COLUMNS@r{, environment variable} -If Emacs supports the variable @code{shell-command-width} (since Emacs +If Emacs supports the variable @code{async-shell-command-width} (since Emacs 27.1), @value{tramp} cares about its value for asynchronous shell commands. It specifies the number of display columns for command output. For synchronous shell commands, a similar effect can be diff --git a/etc/NEWS b/etc/NEWS index 6fcf5187e9a..baec8e7163c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1119,8 +1119,8 @@ variable for remote shells. It still defaults to "/bin/sh". ** Single shell commands --- -*** 'shell-command-width' defines the number of display columns -available for output of asynchronous or remote shell commands. +*** 'async-shell-command-width' defines the number of display columns +available for output of asynchronous shell commands. ** Pcomplete diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 911fa912727..1f83756c322 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3640,10 +3640,10 @@ support symbolic links." (if (and (not current-buffer-p) (integerp asynchronous)) (let ((tramp-remote-process-environment - ;; `shell-command-width' has been introduced with Emacs 27.1. - (if (natnump (bound-and-true-p shell-command-width)) + ;; `async-shell-command-width' has been introduced with Emacs 27.1. + (if (natnump (bound-and-true-p async-shell-command-width)) (cons (format "COLUMNS=%d" - (bound-and-true-p shell-command-width)) + (bound-and-true-p async-shell-command-width)) tramp-remote-process-environment) tramp-remote-process-environment))) (prog1 diff --git a/lisp/simple.el b/lisp/simple.el index acea1f9ddc1..4454791ad20 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3353,7 +3353,7 @@ is output." :group 'shell :version "26.1") -(defcustom shell-command-width nil +(defcustom async-shell-command-width nil "Number of display columns available for asynchronous shell command output. If nil, use the shell default number (usually 80 columns). If a positive integer, tell the shell to use that number of columns for @@ -3627,8 +3627,8 @@ impose the use of a shell (with its need to quote arguments)." (shell-command--save-pos-or-erase) (setq default-directory directory) (let ((process-environment - (if (natnump shell-command-width) - (cons (format "COLUMNS=%d" shell-command-width) + (if (natnump async-shell-command-width) + (cons (format "COLUMNS=%d" async-shell-command-width) process-environment) process-environment))) (setq proc diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index cba697da18c..7d3c43408d4 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -4192,18 +4192,17 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." ;; Cleanup. (ignore-errors (delete-file tmp-name))) - ;; Test `shell-command-width' of `async-shell-command'. - ;; Since Emacs 27.1. - (when (and (boundp 'shell-command-width) + ;; Test `async-shell-command-width'. Since Emacs 27.1. + (when (and (boundp 'async-shell-command-width) (zerop (call-process "tput" nil nil nil "cols")) (zerop (process-file "tput" nil nil nil "cols"))) - (let (shell-command-width) + (let (async-shell-command-width) (should (string-equal (format "%s\n" (car (process-lines "tput" "cols"))) (tramp--test-shell-command-to-string-asynchronously "tput cols"))) - (setq shell-command-width 1024) + (setq async-shell-command-width 1024) (should (string-equal "1024\n" -- 2.39.2