aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-03-07 21:02:24 +0200
committerEli Zaretskii2018-03-07 21:02:24 +0200
commit61c1f80f0544b3da784f97ec2368aec809c8524b (patch)
treee77969a57b18329e83a2b84a22b904a4e0ef13f9
parentd523e4accd6656b6960e0990a353f00b1f42feff (diff)
downloademacs-61c1f80f0544b3da784f97ec2368aec809c8524b.tar.gz
emacs-61c1f80f0544b3da784f97ec2368aec809c8524b.zip
Minor copyedits in display.texi
* doc/emacs/display.texi (Highlight Interactively) (Useless Whitespace, Line Truncation, Visual Line Mode): Minor changes of wording and typo corrections. Suggested by Michael Albinus <michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.
-rw-r--r--doc/emacs/display.texi21
1 files changed, 11 insertions, 10 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 312f70e13ba..3a0116a7456 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -971,7 +971,7 @@ version.)
971Highlight text that matches @var{regexp} using face @var{face} 971Highlight text that matches @var{regexp} using face @var{face}
972(@code{highlight-regexp}). The highlighting will remain as long as 972(@code{highlight-regexp}). The highlighting will remain as long as
973the buffer is loaded. For example, to highlight all occurrences of 973the buffer is loaded. For example, to highlight all occurrences of
974the word ``whim'' using the default face (a yellow background) 974the word ``whim'' using the default face (a yellow background), type
975@kbd{M-s h r whim @key{RET} @key{RET}}. Any face can be used for 975@kbd{M-s h r whim @key{RET} @key{RET}}. Any face can be used for
976highlighting, Hi Lock provides several of its own and these are 976highlighting, Hi Lock provides several of its own and these are
977pre-loaded into a list of default values. While being prompted 977pre-loaded into a list of default values. While being prompted
@@ -1239,7 +1239,7 @@ and @code{newline-mark}.
1239Highlight trailing whitespace. 1239Highlight trailing whitespace.
1240 1240
1241@item tabs 1241@item tabs
1242Highlight tab characters. 1242Highlight TAB characters.
1243 1243
1244@item spaces 1244@item spaces
1245Highlight space and non-breaking space characters. 1245Highlight space and non-breaking space characters.
@@ -1263,10 +1263,10 @@ highlighted. To change that, customize the regular expression
1263@code{whitespace-big-indent-regexp}. 1263@code{whitespace-big-indent-regexp}.
1264 1264
1265@item space-mark 1265@item space-mark
1266Draw space and non-breaking characters with a special glyph. 1266Draw SPC and non-breaking characters with a special glyph.
1267 1267
1268@item tab-mark 1268@item tab-mark
1269Draw tab characters with a special glyph. 1269Draw TAB characters with a special glyph.
1270 1270
1271@item newline-mark 1271@item newline-mark
1272Draw newline characters with a special glyph. 1272Draw newline characters with a special glyph.
@@ -1649,8 +1649,8 @@ Emacs can display long lines by @dfn{truncation}. This means that all
1649the characters that do not fit in the width of the screen or window do 1649the characters that do not fit in the width of the screen or window do
1650not appear at all. On graphical displays, a small straight arrow in 1650not appear at all. On graphical displays, a small straight arrow in
1651the fringe indicates truncation at either end of the line. On text 1651the fringe indicates truncation at either end of the line. On text
1652terminals, this is indicated with @samp{$} signs in the leftmost 1652terminals, this is indicated with @samp{$} signs in the rightmost
1653and/or rightmost columns. 1653and/or leftmost columns.
1654 1654
1655@vindex truncate-lines 1655@vindex truncate-lines
1656@findex toggle-truncate-lines 1656@findex toggle-truncate-lines
@@ -1676,8 +1676,9 @@ 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
1677more screen lines, like in ordinary line continuation. However, Emacs 1677more screen lines, like in ordinary line continuation. However, Emacs
1678attempts to wrap the line at word boundaries near the right window 1678attempts to wrap the line at word boundaries near the right window
1679edge. This makes the text easier to read, as wrapping does not occur 1679edge. (If line's direction is right-to-left, it is wrapped at the
1680in the middle of words. 1680left window edge instead.) This makes the text easier to read, as
1681wrapping does not occur in the middle of words.
1681 1682
1682@cindex mode, Visual Line 1683@cindex mode, Visual Line
1683@cindex Visual Line mode 1684@cindex Visual Line mode
@@ -1688,8 +1689,8 @@ To turn on Visual Line mode in the current buffer, type @kbd{M-x
1688visual-line-mode}; repeating this command turns it off. You can also 1689visual-line-mode}; repeating this command turns it off. You can also
1689turn on Visual Line mode using the menu bar: in the Options menu, 1690turn on Visual Line mode using the menu bar: in the Options menu,
1690select the @samp{Line Wrapping in this Buffer} submenu, followed by 1691select the @samp{Line Wrapping in this Buffer} submenu, followed by
1691the @samp{Word Wrap (Visual Line Mode)} menu item. While Visual Line 1692the @samp{Word Wrap (Visual Line mode)} menu item. While Visual Line
1692mode is enabled, the mode-line shows the string @samp{wrap} in the 1693mode is enabled, the mode line shows the string @samp{wrap} in the
1693mode display. The command @kbd{M-x global-visual-line-mode} toggles 1694mode display. The command @kbd{M-x global-visual-line-mode} toggles
1694Visual Line mode in all buffers. 1695Visual Line mode in all buffers.
1695 1696