aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-10-24 12:13:01 +0300
committerEli Zaretskii2014-10-24 12:13:01 +0300
commit73fd041d910f737746b952f2845fbf419f6ab0d3 (patch)
tree631b0291f734a5a0084401f759c713f5d9b95092
parent9e147f750bfc25894c0d14e53f44d4996d441a96 (diff)
downloademacs-73fd041d910f737746b952f2845fbf419f6ab0d3.tar.gz
emacs-73fd041d910f737746b952f2845fbf419f6ab0d3.zip
Improve documentation of faces in the user manual.
doc/emacs/frames.texi (Scroll Bars): Improve indexing of faces. doc/emacs/killing.texi (Secondary Selection): Improve indexing of faces. doc/emacs/search.texi (Basic Isearch, Query Replace): Improve indexing of faces. doc/emacs/display.texi (Standard Faces, Text Display) (Useless Whitespace): Improve indexing of faces.
-rw-r--r--doc/emacs/ChangeLog11
-rw-r--r--doc/emacs/display.texi17
-rw-r--r--doc/emacs/frames.texi4
-rw-r--r--doc/emacs/killing.texi1
-rw-r--r--doc/emacs/search.texi3
5 files changed, 35 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2b9a13069d2..2261be11a15 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,14 @@
12014-10-24 Eli Zaretskii <eliz@gnu.org>
2
3 * frames.texi (Scroll Bars): Improve indexing of faces.
4
5 * killing.texi (Secondary Selection): Improve indexing of faces.
6
7 * search.texi (Basic Isearch, Query Replace): Improve indexing of faces.
8
9 * display.texi (Standard Faces, Text Display)
10 (Useless Whitespace): Improve indexing of faces.
11
12014-10-23 Tassilo Horn <tsdh@gnu.org> 122014-10-23 Tassilo Horn <tsdh@gnu.org>
2 13
3 * misc.texi (Document View): Adapt to latest doc-view changes wrt 14 * misc.texi (Document View): Adapt to latest doc-view changes wrt
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 0a77e722d32..a5555d58054 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -578,6 +578,7 @@ Parameters}.
578 578
579@node Standard Faces 579@node Standard Faces
580@section Standard Faces 580@section Standard Faces
581@cindex standard faces
581 582
582 Here are the standard faces for specifying text appearance. You can 583 Here are the standard faces for specifying text appearance. You can
583apply them to specific text when you want the effects they produce. 584apply them to specific text when you want the effects they produce.
@@ -598,8 +599,10 @@ This face underlines text.
598This face forces use of a fixed-width font. It's reasonable to 599This face forces use of a fixed-width font. It's reasonable to
599customize this face to use a different fixed-width font, if you like, 600customize this face to use a different fixed-width font, if you like,
600but you should not make it a variable-width font. 601but you should not make it a variable-width font.
602@cindex variable-pitch face
601@item variable-pitch 603@item variable-pitch
602This face forces use of a variable-width font. 604This face forces use of a variable-width font.
605@cindex shadow face
603@item shadow 606@item shadow
604This face is used for making the text less noticeable than the surrounding 607This face is used for making the text less noticeable than the surrounding
605ordinary text. Usually this can be achieved by using shades of gray in 608ordinary text. Usually this can be achieved by using shades of gray in
@@ -647,25 +650,34 @@ frame:
647 650
648@table @code 651@table @code
649@item mode-line 652@item mode-line
653@cindex mode-line face
654@cindex faces for mode lines
650This face is used for the mode line of the currently selected window, 655This face is used for the mode line of the currently selected window,
651and for menu bars when toolkit menus are not used. By default, it's 656and for menu bars when toolkit menus are not used. By default, it's
652drawn with shadows for a ``raised'' effect on graphical displays, and 657drawn with shadows for a ``raised'' effect on graphical displays, and
653drawn as the inverse of the default face on non-windowed terminals. 658drawn as the inverse of the default face on non-windowed terminals.
654@item mode-line-inactive 659@item mode-line-inactive
660@cindex mode-line-inactive face
655Like @code{mode-line}, but used for mode lines of the windows other 661Like @code{mode-line}, but used for mode lines of the windows other
656than the selected one (if @code{mode-line-in-non-selected-windows} is 662than the selected one (if @code{mode-line-in-non-selected-windows} is
657non-@code{nil}). This face inherits from @code{mode-line}, so changes 663non-@code{nil}). This face inherits from @code{mode-line}, so changes
658in that face affect mode lines in all windows. 664in that face affect mode lines in all windows.
659@item mode-line-highlight 665@item mode-line-highlight
660Like @code{highlight}, but used for portions of text on mode lines. 666@cindex mode-line-highlight face
667Like @code{highlight}, but used for mouse-sensitive portions of text
668on mode lines. Such portions of text typically pop up tooltips
669(@pxref{Tooltips}) when the mouse pointer hovers above them.
661@item mode-line-buffer-id 670@item mode-line-buffer-id
671@cindex mode-line-buffer-id face
662This face is used for buffer identification parts in the mode line. 672This face is used for buffer identification parts in the mode line.
663@item header-line 673@item header-line
674@cindex header-line face
664Similar to @code{mode-line} for a window's header line, which appears 675Similar to @code{mode-line} for a window's header line, which appears
665at the top of a window just as the mode line appears at the bottom. 676at the top of a window just as the mode line appears at the bottom.
666Most windows do not have a header line---only some special modes, such 677Most windows do not have a header line---only some special modes, such
667Info mode, create one. 678Info mode, create one.
668@item vertical-border 679@item vertical-border
680@cindex vertical-border face
669This face is used for the vertical divider between windows on text 681This face is used for the vertical divider between windows on text
670terminals. 682terminals.
671@item minibuffer-prompt 683@item minibuffer-prompt
@@ -1110,6 +1122,7 @@ empty lines at the end of a buffer, without realizing it. In most
1110cases, this @dfn{trailing whitespace} has no effect, but sometimes it 1122cases, this @dfn{trailing whitespace} has no effect, but sometimes it
1111can be a nuisance. 1123can be a nuisance.
1112 1124
1125@cindex trailing-whitespace face
1113 You can make trailing whitespace at the end of a line visible by 1126 You can make trailing whitespace at the end of a line visible by
1114setting the buffer-local variable @code{show-trailing-whitespace} to 1127setting the buffer-local variable @code{show-trailing-whitespace} to
1115@code{t}. Then Emacs displays trailing whitespace, using the face 1128@code{t}. Then Emacs displays trailing whitespace, using the face
@@ -1418,6 +1431,8 @@ as octal escape sequences instead of caret escape sequences.
1418@cindex non-breaking space 1431@cindex non-breaking space
1419@cindex non-breaking hyphen 1432@cindex non-breaking hyphen
1420@cindex soft hyphen 1433@cindex soft hyphen
1434@cindex escape-glyph face
1435@cindex nobreak-space face
1421 Some non-@acronym{ASCII} characters have the same appearance as an 1436 Some non-@acronym{ASCII} characters have the same appearance as an
1422@acronym{ASCII} space or hyphen (minus) character. Such characters 1437@acronym{ASCII} space or hyphen (minus) character. Such characters
1423can cause problems if they are entered into a buffer without your 1438can cause problems if they are entered into a buffer without your
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index c02619e82c5..538bcab6a19 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -961,6 +961,10 @@ end of the buffer is shown; if @code{nil}, the thumb will be at the
961bottom when the end of the buffer is shown. You can not over-scroll 961bottom when the end of the buffer is shown. You can not over-scroll
962when the entire buffer is visible. 962when the entire buffer is visible.
963 963
964@cindex scroll-bar face
965 The visual appearance of the scroll bars is controlled by the
966@code{scroll-bar} face.
967
964@node Drag and Drop 968@node Drag and Drop
965@section Drag and Drop 969@section Drag and Drop
966@cindex drag and drop 970@cindex drag and drop
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index f4b1752643d..e258d1ca1a0 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -588,6 +588,7 @@ you can access it using the following Emacs commands:
588@table @kbd 588@table @kbd
589@findex mouse-set-secondary 589@findex mouse-set-secondary
590@kindex M-Drag-Mouse-1 590@kindex M-Drag-Mouse-1
591@cindex secondary-selection face
591@item M-Drag-Mouse-1 592@item M-Drag-Mouse-1
592Set the secondary selection, with one end at the place where you press 593Set the secondary selection, with one end at the place where you press
593down the button, and the other end at the place where you release it 594down the button, and the other end at the place where you release it
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index bdfb534e186..bd0bd0bf641 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -86,6 +86,7 @@ not be the first @samp{F} previously found. After another @kbd{O},
86the cursor moves to just after the first @samp{FOO}. 86the cursor moves to just after the first @samp{FOO}.
87 87
88@cindex faces for highlighting search matches 88@cindex faces for highlighting search matches
89@cindex isearch face
89 At each step, Emacs highlights the @dfn{current match}---the buffer 90 At each step, Emacs highlights the @dfn{current match}---the buffer
90text that matches the search string---using the @code{isearch} face 91text that matches the search string---using the @code{isearch} face
91(@pxref{Faces}). The current search string is also displayed in the 92(@pxref{Faces}). The current search string is also displayed in the
@@ -1280,6 +1281,8 @@ It works like @code{replace-regexp} except that it queries
1280like @code{query-replace}. 1281like @code{query-replace}.
1281 1282
1282@cindex faces for highlighting query replace 1283@cindex faces for highlighting query replace
1284@cindex query-replace face
1285@cindex lazy-highlight face
1283 These commands highlight the current match using the face 1286 These commands highlight the current match using the face
1284@code{query-replace}. They highlight other matches using 1287@code{query-replace}. They highlight other matches using
1285@code{lazy-highlight} just like incremental search (@pxref{Incremental 1288@code{lazy-highlight} just like incremental search (@pxref{Incremental