diff options
| author | Xue Fuqiao | 2013-10-17 21:46:44 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-10-17 21:46:44 +0800 |
| commit | 475c7d3f4f9d61a8f097635656aa8c744aff3e0a (patch) | |
| tree | cf641d02e8041bfc58534f46739cd82cd047ec7b | |
| parent | 12b10f017c486ebca34a3cf0e9233f11ecf55dc9 (diff) | |
| download | emacs-475c7d3f4f9d61a8f097635656aa8c744aff3e0a.tar.gz emacs-475c7d3f4f9d61a8f097635656aa8c744aff3e0a.zip | |
* doc/lispref/display.texi (Width): Fix arguments of ‘truncate-string-to-width’.
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f6d34c01466..253398a3ec2 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-10-17 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * display.texi (Width): Fix arguments of ‘truncate-string-to-width’. | ||
| 4 | |||
| 1 | 2013-10-16 Xue Fuqiao <xfq.free@gmail.com> | 5 | 2013-10-16 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 6 | ||
| 3 | * display.texi (Selective Display): Add an index for explicit | 7 | * display.texi (Selective Display): Add an index for explicit |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 8be8df55c5c..75c27daa96e 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -1796,8 +1796,8 @@ the beginning of the result if one multi-column character in | |||
| 1796 | 1796 | ||
| 1797 | If @var{ellipsis} is non-@code{nil}, it should be a string which will | 1797 | If @var{ellipsis} is non-@code{nil}, it should be a string which will |
| 1798 | replace the end of @var{str} (including any padding) if it extends | 1798 | replace the end of @var{str} (including any padding) if it extends |
| 1799 | beyond @var{end-column}, unless the display width of @var{str} is | 1799 | beyond @var{width}, unless the display width of @var{string} is equal |
| 1800 | equal to or less than the display width of @var{ellipsis}. If | 1800 | to or less than the display width of @var{ellipsis}. If |
| 1801 | @var{ellipsis} is non-@code{nil} and not a string, it stands for | 1801 | @var{ellipsis} is non-@code{nil} and not a string, it stands for |
| 1802 | @code{"..."}. | 1802 | @code{"..."}. |
| 1803 | 1803 | ||