diff options
| -rw-r--r-- | doc/lispref/display.texi | 3 | ||||
| -rw-r--r-- | etc/NEWS | 5 | ||||
| -rw-r--r-- | lisp/international/mule-util.el | 3 |
3 files changed, 7 insertions, 4 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 | |||
| 1889 | the beginning of the result if one multi-column character in | 1889 | the 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 | ||
| 1892 | If @var{ellipsis} is non-@code{nil}, it should be a string which will | 1893 | If @var{ellipsis} is non-@code{nil}, it should be a string which will |
| 1893 | replace the end of @var{string} (including any padding) if it extends | 1894 | replace the end of @var{string} (including any padding) if it extends |
| 1894 | beyond @var{width}, unless the display width of @var{string} is equal | 1895 | beyond @var{width}, unless the display width of @var{string} is equal |
| 1895 | to or less than the display width of @var{ellipsis}. If | 1896 | to 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{"..."}. | 1898 | the 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) |
| @@ -166,8 +166,6 @@ have the equivalent of a primary selection. | |||
| 166 | ** `insert-register' now leaves point after the inserted text | 166 | ** `insert-register' now leaves point after the inserted text |
| 167 | when called interactively. A prefix argument toggles this behavior. | 167 | when called interactively. A prefix argument toggles this behavior. |
| 168 | 168 | ||
| 169 | ** New var `truncate-string-ellipsis' to choose how to indicate truncation. | ||
| 170 | |||
| 171 | +++ | 169 | +++ |
| 172 | ** The new variable `term-file-aliases' replaces some files from lisp/term. | 170 | ** The new variable `term-file-aliases' replaces some files from lisp/term. |
| 173 | The function `tty-run-terminal-initialization' consults this variable | 171 | The function `tty-run-terminal-initialization' consults this variable |
| @@ -1302,6 +1300,9 @@ if the terminal cannot display curved quotes. | |||
| 1302 | ** Standard output and error streams now transliterate characters via | 1300 | ** Standard output and error streams now transliterate characters via |
| 1303 | standard-display-table, and encode output using locale-coding-system. | 1301 | standard-display-table, and encode output using locale-coding-system. |
| 1304 | 1302 | ||
| 1303 | +++ | ||
| 1304 | ** New var `truncate-string-ellipsis' to choose how to indicate truncation. | ||
| 1305 | |||
| 1305 | ** Miscellaneous name change | 1306 | ** Miscellaneous name change |
| 1306 | 1307 | ||
| 1307 | For consistency with the usual Emacs spelling, the Lisp variable | 1308 | For consistency with the usual Emacs spelling, the Lisp variable |
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index b575c2b7db3..c70a3eee0fb 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el | |||
| @@ -55,7 +55,8 @@ | |||
| 55 | string) | 55 | string) |
| 56 | 56 | ||
| 57 | (defvar truncate-string-ellipsis "..." ;"…" | 57 | (defvar truncate-string-ellipsis "..." ;"…" |
| 58 | "String to use to indicate truncation.") | 58 | "String to use to indicate truncation. |
| 59 | Serves as default value of ELLIPSIS argument to `truncate-string-to-width'.") | ||
| 59 | 60 | ||
| 60 | ;;;###autoload | 61 | ;;;###autoload |
| 61 | (defun truncate-string-to-width (str end-column | 62 | (defun truncate-string-to-width (str end-column |