aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2018-02-01 19:56:51 +0200
committerEli Zaretskii2018-02-01 19:56:51 +0200
commitb90e91ca54d7fd47047edf4d1b9c49268e31e487 (patch)
tree4cbfdce325521fb61c97466d63d946522b055ecd /doc
parentf180075f15c6bee19c23ce758dda228f4594e411 (diff)
downloademacs-b90e91ca54d7fd47047edf4d1b9c49268e31e487.tar.gz
emacs-b90e91ca54d7fd47047edf4d1b9c49268e31e487.zip
Fix last change of @key markup
* doc/lispref/display.texi (Specified Space): * doc/emacs/programs.texi (C Modes): * doc/emacs/killing.texi (Rectangles): * doc/emacs/emacs.texi (Top): * doc/emacs/display.texi (Useless Whitespace): Don't use @key markup for characters and commands, only for keys.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/display.texi6
-rw-r--r--doc/emacs/emacs.texi2
-rw-r--r--doc/emacs/killing.texi2
-rw-r--r--doc/emacs/programs.texi2
-rw-r--r--doc/lispref/display.texi2
5 files changed, 7 insertions, 7 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index d0ab5486af1..b2a4011b4a7 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1259,9 +1259,9 @@ Highlight empty lines.
1259@item big-indent 1259@item big-indent
1260@vindex whitespace-big-indent-regexp 1260@vindex whitespace-big-indent-regexp
1261Highlight too-deep indentation. By default any sequence of at least 4 1261Highlight too-deep indentation. By default any sequence of at least 4
1262consecutive @key{TAB} characters or 32 consecutive @key{SPC} 1262consecutive TAB characters or 32 consecutive SPC characters is
1263characters is highlighted. To change that, customize the regular 1263highlighted. To change that, customize the regular expression
1264expression @code{whitespace-big-indent-regexp}. 1264@code{whitespace-big-indent-regexp}.
1265 1265
1266@item space-mark 1266@item space-mark
1267Draw space and non-breaking characters with a special glyph. 1267Draw space and non-breaking characters with a special glyph.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index b0539221b82..0051868fee6 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -723,7 +723,7 @@ C and Related Modes
723 723
724* Motion in C:: Commands to move by C statements, etc. 724* Motion in C:: Commands to move by C statements, etc.
725* Electric C:: Colon and other chars can automatically reindent. 725* Electric C:: Colon and other chars can automatically reindent.
726* Hungry Delete:: A more powerful @key{DEL} command. 726* Hungry Delete:: A more powerful DEL command.
727* Other C Commands:: Filling comments, viewing expansion of macros, 727* Other C Commands:: Filling comments, viewing expansion of macros,
728 and other neat features. 728 and other neat features.
729 729
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 78203936c78..6efcc9d35de 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -857,7 +857,7 @@ region is active.
857 857
858Unlike the standard region, the region-rectangle can have its corners 858Unlike the standard region, the region-rectangle can have its corners
859extended past the end of buffer, or inside stretches of white space 859extended past the end of buffer, or inside stretches of white space
860that point normally cannot enter, like the @key{TAB}. 860that point normally cannot enter, like the TAB.
861 861
862@findex rectangle-exchange-point-and-mark 862@findex rectangle-exchange-point-and-mark
863@findex exchange-point-and-mark@r{, in rectangle-mark-mode} 863@findex exchange-point-and-mark@r{, in rectangle-mark-mode}
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 970647e1277..42891245451 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1587,7 +1587,7 @@ with Emacs.
1587@menu 1587@menu
1588* Motion in C:: Commands to move by C statements, etc. 1588* Motion in C:: Commands to move by C statements, etc.
1589* Electric C:: Colon and other chars can automatically reindent. 1589* Electric C:: Colon and other chars can automatically reindent.
1590* Hungry Delete:: A more powerful @key{DEL} command. 1590* Hungry Delete:: A more powerful DEL command.
1591* Other C Commands:: Filling comments, viewing expansion of macros, 1591* Other C Commands:: Filling comments, viewing expansion of macros,
1592 and other neat features. 1592 and other neat features.
1593@end menu 1593@end menu
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index bd1f671225c..fbf943a08c7 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4599,7 +4599,7 @@ first character in the group of consecutive characters that have the
4599same @code{display} property. The space width is the pixel width of 4599same @code{display} property. The space width is the pixel width of
4600that character, multiplied by @var{factor}. (On text-mode terminals, 4600that character, multiplied by @var{factor}. (On text-mode terminals,
4601the ``pixel width'' of a character is usually 1, but it could be more 4601the ``pixel width'' of a character is usually 1, but it could be more
4602for @key{TAB}s and double-width CJK characters.) 4602for TABs and double-width CJK characters.)
4603 4603
4604@item :align-to @var{hpos} 4604@item :align-to @var{hpos}
4605Specifies that the space should be wide enough to reach @var{hpos}. 4605Specifies that the space should be wide enough to reach @var{hpos}.