summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2019-04-14 17:50:12 +0300
committerEli Zaretskii <eliz@gnu.org>2019-04-14 17:50:12 +0300
commit29b36a007ae04839a4c29c62b2b1ee7940a8539a (patch)
tree442ecb6790bf78f470d68836306fb26fb097c37e
parentd209d646220bf1967e12d2de5c37b2be82e29835 (diff)
downloademacs-29b36a007ae04839a4c29c62b2b1ee7940a8539a.tar.gz
Improve documentation of a recent commit
* etc/NEWS: Fix the description of 'shell-command-width'. Mark the entry as not needing the manual update. * lisp/simple.el (shell-command-width): Doc fix. (Bug#35055)
-rw-r--r--etc/NEWS5
-rw-r--r--lisp/simple.el5
2 files changed, 6 insertions, 4 deletions
diff --git a/etc/NEWS b/etc/NEWS
index d34fb3bb12a..2421b781527 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1066,8 +1066,9 @@ variable for remote shells. It still defaults to "/bin/sh".
** Single shell commands
-*** 'shell-command-width' defines the number of output columns
-for asynchronous shell command.
+---
+*** 'shell-command-width' defines the number of display columns
+available for output of asynchronous shell commands.
** Pcomplete
diff --git a/lisp/simple.el b/lisp/simple.el
index 017ba510007..8647d0985f5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3352,9 +3352,10 @@ is output."
:version "26.1")
(defcustom shell-command-width nil
- "Number of columns available for asynchronous shell command output.
+ "Number of display columns available for asynchronous shell command output.
If nil, use the shell default number (usually 80 columns).
-If a positive integer, use a fixed width for command output."
+If a positive integer, tell the shell to use that number of columns for
+command output."
:type '(choice (const :tag "Use system limit" nil)
(integer :tag "Fixed width" :value 80))
:group 'shell