aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-04-14 17:50:12 +0300
committerEli Zaretskii2019-04-14 17:50:12 +0300
commit29b36a007ae04839a4c29c62b2b1ee7940a8539a (patch)
tree442ecb6790bf78f470d68836306fb26fb097c37e
parentd209d646220bf1967e12d2de5c37b2be82e29835 (diff)
downloademacs-29b36a007ae04839a4c29c62b2b1ee7940a8539a.tar.gz
emacs-29b36a007ae04839a4c29c62b2b1ee7940a8539a.zip
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".
1066 1066
1067** Single shell commands 1067** Single shell commands
1068 1068
1069*** 'shell-command-width' defines the number of output columns 1069---
1070for asynchronous shell command. 1070*** 'shell-command-width' defines the number of display columns
1071available for output of asynchronous shell commands.
1071 1072
1072** Pcomplete 1073** Pcomplete
1073 1074
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."
3352 :version "26.1") 3352 :version "26.1")
3353 3353
3354(defcustom shell-command-width nil 3354(defcustom shell-command-width nil
3355 "Number of columns available for asynchronous shell command output. 3355 "Number of display columns available for asynchronous shell command output.
3356If nil, use the shell default number (usually 80 columns). 3356If nil, use the shell default number (usually 80 columns).
3357If a positive integer, use a fixed width for command output." 3357If a positive integer, tell the shell to use that number of columns for
3358command output."
3358 :type '(choice (const :tag "Use system limit" nil) 3359 :type '(choice (const :tag "Use system limit" nil)
3359 (integer :tag "Fixed width" :value 80)) 3360 (integer :tag "Fixed width" :value 80))
3360 :group 'shell 3361 :group 'shell