From 37495ab068d6e5c432aee0687a8188bdf7885dcd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Nov 2024 16:08:26 +0200 Subject: [PATCH] ; Fix last change * doc/emacs/display.texi (Standard Faces): Fix indexing. * lisp/faces.el (header-line-active, header-line-inactive): Fix the :version tag. (Bug#73862) (cherry picked from commit f630520be97a9dda5e4b93765dbd82b6e9b298d0) --- doc/emacs/display.texi | 30 +++++++++++++++--------------- lisp/faces.el | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 474a74de607..66f6211a600 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -742,8 +742,8 @@ Display}). frame: @table @code -@item mode-line @cindex @code{mode-line} face +@item mode-line This is the base face used for the mode lines, as well as header lines and for menu bars when toolkit menus are not used. By default, it's drawn with shadows for a raised effect on graphical displays, and @@ -752,31 +752,31 @@ drawn as the inverse of the default face on text terminals. The @code{mode-line-active} and @code{mode-line-inactive} faces (which are the ones used on the mode lines) inherit from this face. -@item mode-line-active @cindex faces for mode lines +@item mode-line-active Like @code{mode-line}, but used for the mode line of the currently selected window. This face inherits from @code{mode-line}, so changes in that face affect mode lines in all windows. -@item mode-line-inactive @cindex @code{mode-line-inactive} face +@item mode-line-inactive Like @code{mode-line}, but used for mode lines of the windows other than the selected one (if @code{mode-line-in-non-selected-windows} is non-@code{nil}). This face inherits from @code{mode-line}, so changes in that face affect mode lines in all windows. -@item mode-line-highlight @cindex @code{mode-line-highlight} face +@item mode-line-highlight Like @code{highlight}, but used for mouse-sensitive portions of text on mode lines. Such portions of text typically pop up tooltips (@pxref{Tooltips}) when the mouse pointer hovers above them. -@item mode-line-buffer-id @cindex @code{mode-line-buffer-id} face +@item mode-line-buffer-id This face is used for buffer identification parts in the mode line. -@item header-line @cindex @code{header-line} face +@item header-line Similar to @code{mode-line} for a window's header line, which appears at the top of a window just as the mode line appears at the bottom. Most windows do not have a header line---only some special modes, such @@ -785,40 +785,40 @@ Info mode, create one. The @code{header-line-active} and @code{header-line-inactive} faces (which are the ones used on the header lines) inherit from this face. -@item header-line-active @cindex faces for header lines +@item header-line-active Like @code{header-line}, but used for the header line of the currently selected window. This face inherits from @code{header-line}, so changes in that face affect header lines in all windows. -@item header-line-inactive @cindex @code{header-line-inactive} face +@item header-line-inactive Like @code{header-line}, but used for header lines of the windows other than the selected one (if those windows have a header line). This face inherits from @code{header-line}, so changes in that face affect header lines in all windows. -@item header-line-highlight @cindex @code{header-line-highlight} face +@item header-line-highlight Similar to @code{highlight} and @code{mode-line-highlight}, but used for mouse-sensitive portions of text on header lines. This is a separate face because the @code{header-line} face might be customized in a way that does not interact well with @code{highlight}. -@item tab-line @cindex @code{tab-line} face +@item tab-line Similar to @code{mode-line} for a window's tab line, which appears at the top of a window with tabs representing window buffers. @xref{Tab Line}. -@item vertical-border @cindex @code{vertical-border} face +@item vertical-border This face is used for the vertical divider between windows on text terminals. -@item minibuffer-prompt @cindex @code{minibuffer-prompt} face @vindex minibuffer-prompt-properties +@item minibuffer-prompt This face is used for the prompt strings displayed in the minibuffer. By default, Emacs automatically adds this face to the value of @code{minibuffer-prompt-properties}, which is a list of text @@ -826,8 +826,8 @@ properties (@pxref{Text Properties,,, elisp, the Emacs Lisp Reference Manual}) used to display the prompt text. (This variable takes effect when you enter the minibuffer.) -@item fringe @cindex @code{fringe} face +@item fringe The face for the fringes to the left and right of windows on graphic displays. (The fringes are the narrow portions of the Emacs frame between the text area and the window's right and left borders.) @@ -859,15 +859,15 @@ This face determines the visual appearance of the scroll bar. This face determines the color of tool bar icons. @xref{Tool Bars}. @item tab-bar This face determines the color of tab bar icons. @xref{Tab Bars}. -@item menu @cindex menu bar appearance @cindex @code{menu} face, no effect if customized @cindex customization of @code{menu} face +@item menu This face determines the colors and font of Emacs's menus. @xref{Menu Bars}. -@item tty-menu-enabled-face @cindex faces for text-mode menus @cindex TTY menu faces +@item tty-menu-enabled-face This face is used to display enabled menu items on text-mode terminals. @item tty-menu-disabled-face diff --git a/lisp/faces.el b/lisp/faces.el index 5d4a87a06e3..af99e1b6722 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2869,14 +2869,14 @@ Use the face `mode-line-highlight' for features that can be selected." '((t :inherit header-line)) "Face for the selected header line. This inherits from the `header-line' face." - :version "29.5" + :version "31.1" :group 'mode-line-faces :group 'basic-faces) (defface header-line-inactive '((t :inherit header-line)) "Basic header line face for non-selected windows." - :version "29.5" + :version "31.1" :group 'mode-line-faces :group 'basic-faces) -- 2.39.5