diff options
| author | Paul Eggert | 2018-03-10 18:30:54 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-03-10 18:30:54 -0800 |
| commit | 767780169b095b15d6be32ac5be1aba00f1ccbc2 (patch) | |
| tree | 8deacf576ac3b627ce4894253310a48bee3b2b24 /doc | |
| parent | 60c4cf6311b84ed7ec007702a0cdd7881f9f647c (diff) | |
| parent | 6af509ec672f8b32076007bf17ad8cf45668f4cd (diff) | |
| download | emacs-767780169b095b15d6be32ac5be1aba00f1ccbc2.tar.gz emacs-767780169b095b15d6be32ac5be1aba00f1ccbc2.zip | |
Merge from origin/emacs-26
6af509e Replace the obsolete process-kill-without-query in documentation
4df0d15 ; Tiny fix for recent doc change
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/display.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 499be26004d..42a52279832 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -1676,7 +1676,7 @@ line truncation. @xref{Split Window}, for the variable | |||
| 1676 | @dfn{word wrap}. Here, each long logical line is divided into two or | 1676 | @dfn{word wrap}. Here, each long logical line is divided into two or |
| 1677 | more screen lines, like in ordinary line continuation. However, Emacs | 1677 | more screen lines, like in ordinary line continuation. However, Emacs |
| 1678 | attempts to wrap the line at word boundaries near the right window | 1678 | attempts to wrap the line at word boundaries near the right window |
| 1679 | edge. (If line's direction is right-to-left, it is wrapped at the | 1679 | edge. (If the line's direction is right-to-left, it is wrapped at the |
| 1680 | left window edge instead.) This makes the text easier to read, as | 1680 | left window edge instead.) This makes the text easier to read, as |
| 1681 | wrapping does not occur in the middle of words. | 1681 | wrapping does not occur in the middle of words. |
| 1682 | 1682 | ||