aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2015-11-29 19:40:08 +0200
committerEli Zaretskii2015-11-29 19:40:08 +0200
commitf3bd8262a2f5ea104ca0394683098e3c2efe3024 (patch)
treea22069ae7cdd006e25d36966b5ead8a99acd07ef /doc
parentc32063e7c0c505746ff50461f3c3a477a1a7846e (diff)
downloademacs-f3bd8262a2f5ea104ca0394683098e3c2efe3024.tar.gz
emacs-f3bd8262a2f5ea104ca0394683098e3c2efe3024.zip
Document truncate-string-ellipsis
* doc/lispref/display.texi (Size of Displayed Text): Document 'truncate-string-ellipsis'. * lisp/international/mule-util.el (truncate-string-ellipsis): Doc fix. (truncate-string-to-width): Mention in the doc string that the default for ELLIPSIS comes from 'truncate-string-ellipsis'. * etc/NEWS: Move the 'truncate-string-ellipsis' entry to the "Lisp Changes" section.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/display.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index ad248b116ed..3d520dbdd69 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1889,12 +1889,13 @@ end of the result if it falls short of @var{width}. It is also used at
1889the beginning of the result if one multi-column character in 1889the beginning of the result if one multi-column character in
1890@var{string} extends across the column @var{start-column}. 1890@var{string} extends across the column @var{start-column}.
1891 1891
1892@vindex truncate-string-ellipsis
1892If @var{ellipsis} is non-@code{nil}, it should be a string which will 1893If @var{ellipsis} is non-@code{nil}, it should be a string which will
1893replace the end of @var{string} (including any padding) if it extends 1894replace the end of @var{string} (including any padding) if it extends
1894beyond @var{width}, unless the display width of @var{string} is equal 1895beyond @var{width}, unless the display width of @var{string} is equal
1895to or less than the display width of @var{ellipsis}. If 1896to or less than the display width of @var{ellipsis}. If
1896@var{ellipsis} is non-@code{nil} and not a string, it stands for 1897@var{ellipsis} is non-@code{nil} and not a string, it stands for
1897@code{"..."}. 1898the value of the variable @code{truncate-string-ellipsis}.
1898 1899
1899@example 1900@example
1900(truncate-string-to-width "\tab\t" 12 4) 1901(truncate-string-to-width "\tab\t" 12 4)