diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/faces.el | 2 | ||||
| -rw-r--r-- | man/ChangeLog | 4 | ||||
| -rw-r--r-- | man/display.texi | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/dispextern.h | 2 | ||||
| -rw-r--r-- | src/dispnew.c | 2 | ||||
| -rw-r--r-- | src/xfaces.c | 8 |
8 files changed, 24 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 462f9b78517..35178683899 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2005-06-22 Miles Bader <miles@gnu.org> + + * faces.el (vertical-border): Renamed from `vertical-divider'. + 2005-06-21 Juri Linkov <juri@jurta.org> * faces.el (face-user-default-spec): Try getting `customized-face' diff --git a/lisp/faces.el b/lisp/faces.el index 8cca01ad432..9aa8f30101d 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1870,7 +1870,7 @@ created." :group 'modeline :group 'basic-faces) -(defface vertical-divider +(defface vertical-border '((default :inherit mode-line-inactive)) "Face used for vertical window dividers on ttys." :version "22.1" diff --git a/man/ChangeLog b/man/ChangeLog index 33541408e4b..1289ebb6a55 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2005-06-22 Miles Bader <miles@gnu.org> + + * display.texi (Faces): Change `vertical-divider' to `vertical-border'. + 2005-06-20 Miles Bader <miles@gnu.org> * display.texi (Faces): Add `vertical-divider'. diff --git a/man/display.texi b/man/display.texi index 858a33f9ffe..473f1e65e4b 100644 --- a/man/display.texi +++ b/man/display.texi @@ -113,7 +113,7 @@ in that face affect mode lines in all windows. @item header-line Similar to @code{mode-line} for a window's header line. Most modes don't use the header line, but the Info mode does. -@item vertical-divider +@item vertical-border This face is used for the vertical divider between windows on character terminals. By default this face inherits from the @code{mode-line-inactive} face. diff --git a/src/ChangeLog b/src/ChangeLog index 857d832545f..659f1066efc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-06-22 Miles Bader <miles@gnu.org> + + * xfaces.c (Qvertical_border): Renamed from `Qvertical_divider'. + (realize_basic_faces, syms_of_xfaces): Update references to it. + * dispextern.h (enum face_id): Rename `VERTICAL_DIVIDER_FACE_ID' + to `VERTICAL_BORDER_FACE_ID'. + * dispnew.c (build_frame_matrix_from_leaf_window): Update references. + 2005-06-21 Juri Linkov <juri@jurta.org> * dispextern.h: Add extern Qframe_set_background_mode. diff --git a/src/dispextern.h b/src/dispextern.h index 50b2d4368bb..2c70de31436 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1593,7 +1593,7 @@ enum face_id CURSOR_FACE_ID, MOUSE_FACE_ID, MENU_FACE_ID, - VERTICAL_DIVIDER_FACE_ID, + VERTICAL_BORDER_FACE_ID, BASIC_FACE_ID_SENTINEL }; diff --git a/src/dispnew.c b/src/dispnew.c index 5b0069b03c2..38e4daaaefc 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -2727,7 +2727,7 @@ build_frame_matrix_from_leaf_window (frame_matrix, w) if (FAST_GLYPH_FACE (right_border_glyph) <= 0) right_border_glyph - = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_DIVIDER_FACE_ID); + = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_BORDER_FACE_ID); } } else diff --git a/src/xfaces.c b/src/xfaces.c index a2b9882afbf..165ea4c9b8e 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -324,7 +324,7 @@ Lisp_Object Qframe_set_background_mode; Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; -Lisp_Object Qmode_line_inactive, Qvertical_divider; +Lisp_Object Qmode_line_inactive, Qvertical_border; extern Lisp_Object Qmode_line; /* The symbol `face-alias'. A symbols having that property is an @@ -6882,7 +6882,7 @@ realize_basic_faces (f) realize_named_face (f, Qcursor, CURSOR_FACE_ID); realize_named_face (f, Qmouse, MOUSE_FACE_ID); realize_named_face (f, Qmenu, MENU_FACE_ID); - realize_named_face (f, Qvertical_divider, VERTICAL_DIVIDER_FACE_ID); + realize_named_face (f, Qvertical_border, VERTICAL_BORDER_FACE_ID); /* Reflect changes in the `menu' face in menu bars. */ if (FRAME_FACE_CACHE (f)->menu_face_changed_p) @@ -8012,8 +8012,8 @@ syms_of_xfaces () staticpro (&Qmouse); Qmode_line_inactive = intern ("mode-line-inactive"); staticpro (&Qmode_line_inactive); - Qvertical_divider = intern ("vertical-divider"); - staticpro (&Qvertical_divider); + Qvertical_border = intern ("vertical-border"); + staticpro (&Qvertical_border); Qtty_color_desc = intern ("tty-color-desc"); staticpro (&Qtty_color_desc); Qtty_color_standard_values = intern ("tty-color-standard-values"); |