aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Pluim2021-04-16 09:56:41 +0200
committerRobert Pluim2021-04-16 09:56:41 +0200
commitfcd1943bfe9e384e91e2fb87c72b827ac28f05ef (patch)
tree6d6790ba76a3e15a7dcb9f0c29eadede26eaacab
parent2448fb2f25e466766d84e145041a03e9ca3ee182 (diff)
downloademacs-fcd1943bfe9e384e91e2fb87c72b827ac28f05ef.tar.gz
emacs-fcd1943bfe9e384e91e2fb87c72b827ac28f05ef.zip
; Grammar fixes
* doc/lispref/display.texi (Size of Displayed Text): Grammar fix. * etc/NEWS: Grammar fix.
-rw-r--r--doc/lispref/display.texi4
-rw-r--r--etc/NEWS2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index dfba163d4e7..228c940cc8b 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1975,8 +1975,8 @@ Optional arguments @var{from} and @var{to} specify the substring of
1975The return value is an approximation: it only considers the values 1975The return value is an approximation: it only considers the values
1976returned by @code{char-width} for the constituent characters, always 1976returned by @code{char-width} for the constituent characters, always
1977takes a tab character as taking @code{tab-width} columns, ignores 1977takes a tab character as taking @code{tab-width} columns, ignores
1978display properties and fonts, etc. For these reasons, we recommend to 1978display properties and fonts, etc. For these reasons, we recommend
1979use @code{window-text-pixel-size}, described below, instead. 1979using @code{window-text-pixel-size}, described below, instead.
1980@end defun 1980@end defun
1981 1981
1982@defun truncate-string-to-width string width &optional start-column padding ellipsis ellipsis-text-property 1982@defun truncate-string-to-width string width &optional start-column padding ellipsis ellipsis-text-property
diff --git a/etc/NEWS b/etc/NEWS
index e39aa7b4378..b641e8d95f7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2673,7 +2673,7 @@ the selected frame can display it, and using "..." otherwise.
2673 2673
2674+++ 2674+++
2675** 'string-width' now accepts two optional arguments FROM and TO. 2675** 'string-width' now accepts two optional arguments FROM and TO.
2676This allows to calculate the width of a substring without consing a 2676This allows calculating the width of a substring without consing a
2677new string. 2677new string.
2678 2678
2679+++ 2679+++