Add ':extend' attribute to faces and themes

* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.

* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C)
(ediff-even-diff-Ancestor, ediff-odd-diff-A)
(ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.

4 files changed, 23 insertions, 23 deletions

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index dfac1cca808..08998fbc776 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -302,8 +302,8 @@ well."
     (((class color) (min-colors 88) (background dark))
      :background "grey45" :extend t)
     (((class color))
-     :foreground "blue1" :weight bold)
-    (t :weight bold))
+     :foreground "blue1" :weight bold :extend t)
+    (t :weight bold :extend t))
   "`diff-mode' face inherited by hunk and index header faces.")
 
 (defface diff-file-header
@@ -312,8 +312,8 @@ well."
     (((class color) (min-colors 88) (background dark))
      :background "grey60" :weight bold :extend t)
     (((class color))
-     :foreground "cyan" :weight bold)
-    (t :weight bold))			; :height 1.3
+     :foreground "cyan" :weight bold :extend t)
+    (t :weight bold :extend t))			; :height 1.3
   "`diff-mode' face used to highlight file header lines.")
 
 (defface diff-index
@@ -334,7 +334,7 @@ well."
     (((class color) (min-colors 88) (background dark))
      :background "#553333" :extend t)
     (((class color))
-     :foreground "red"))
+     :foreground "red" :extend t))
   "`diff-mode' face used to highlight removed lines.")
 
 (defface diff-added
@@ -347,7 +347,7 @@ well."
     (((class color) (min-colors 88) (background dark))
      :background "#335533" :extend t)
     (((class color))
-     :foreground "green"))
+     :foreground "green" :extend t))
   "`diff-mode' face used to highlight added lines.")
 
 (defface diff-changed
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index ca7f4eb8a22..a9cbf40c5e3 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -813,7 +813,7 @@ to temp files in buffer jobs and when Ediff needs to find fine differences."
      (:foreground "firebrick" :background "pale green" :extend t))
     (((class color))
      (:foreground "blue3" :background "yellow3" :extend t))
-    (t (:inverse-video t)))
+    (t (:inverse-video t :extend t)))
   "Face for highlighting the selected difference in buffer A."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -835,7 +835,7 @@ this variable represents.")
     (((class color))
      (:foreground "magenta3" :background "yellow3"
 		  :weight bold :extend t))
-    (t (:inverse-video t)))
+    (t (:inverse-video t :extend t)))
   "Face for highlighting the selected difference in buffer B."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -856,7 +856,7 @@ this variable represents.")
      (:foreground "Navy" :background "Pink" :extend t))
     (((class color))
      (:foreground "cyan3" :background "yellow3" :weight bold :extend t))
-    (t (:inverse-video t)))
+    (t (:inverse-video t :extend t)))
   "Face for highlighting the selected difference in buffer C."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -879,7 +879,7 @@ this variable represents.")
      :background "#004151" :extend t)
     (((class color))
      (:foreground "black" :background "magenta3" :extend t))
-    (t (:inverse-video t)))
+    (t (:inverse-video t :extend t)))
   "Face for highlighting the selected difference in buffer Ancestor."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1001,7 +1001,7 @@ this variable represents.")
     (((class color))
      (:foreground "red3" :background "light grey"
 		  :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap)))
+    (t (:italic t :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in buffer A."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1020,7 +1020,7 @@ this variable represents.")
      (:foreground "White" :background "Grey" :extend t))
     (((class color))
      (:foreground "blue3" :background "Grey" :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap)))
+    (t (:italic t :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in buffer B."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1042,7 +1042,7 @@ this variable represents.")
     (((class color))
      (:foreground "yellow3" :background "light grey"
 		  :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap)))
+    (t (:italic t :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in buffer C."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1064,7 +1064,7 @@ this variable represents.")
     (((class color))
      (:foreground "cyan3" :background "light grey"
 		  :weight bold :extend t))
-    (t (:italic t :stipple ,stipple-pixmap)))
+    (t (:italic t :stipple ,stipple-pixmap :extend t)))
   "Face for highlighting even-numbered non-current differences in the ancestor buffer."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1092,7 +1092,7 @@ this variable represents.")
      (:foreground "White" :background "Grey" :extend t))
     (((class color))
      (:foreground "red3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1")))
+    (t (:italic t :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in buffer A."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1114,7 +1114,7 @@ this variable represents.")
      (:foreground "Black" :background "light grey" :extend t))
     (((class color))
      (:foreground "cyan3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1")))
+    (t (:italic t :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in buffer B."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1135,7 +1135,7 @@ this variable represents.")
      (:foreground "White" :background "Grey" :extend t))
     (((class color))
      (:foreground "yellow3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1")))
+    (t (:italic t :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in buffer C."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
@@ -1154,7 +1154,7 @@ this variable represents.")
      (:foreground "cyan3" :background "gray40" :extend t))
     (((class color))
      (:foreground "green3" :background "black" :weight bold :extend t))
-    (t (:italic t :stipple "gray1")))
+    (t (:italic t :stipple "gray1" :extend t)))
   "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
   :group 'ediff-highlighting)
 ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 054c2b91340..31d833c6f39 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -197,14 +197,14 @@ If it is nil, `log-view-toggle-entry-display' does nothing.")
 (defface log-view-file
   '((((class color) (background light))
      (:background "grey70" :weight bold :extend t))
-    (t (:weight bold)))
+    (t (:weight bold :extend t)))
   "Face for the file header line in `log-view-mode'."
   :group 'log-view)
 
 (defface log-view-message
   '((((class color) (background light))
      (:background "grey85" :extend t))
-    (t (:weight bold)))
+    (t (:weight bold :extend t)))
   "Face for the message header line in `log-view-mode'."
   :group 'log-view)
 
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 6d2d3f8d42f..cbd5e77120b 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -81,7 +81,7 @@ Used in `smerge-diff-base-upper' and related functions."
     (((class color) (min-colors 88) (background dark))
      :background "#553333" :extend t)
     (((class color))
-     :foreground "red"))
+     :foreground "red" :extend))
   "Face for the `upper' version of a conflict.")
 (define-obsolete-face-alias 'smerge-mine 'smerge-upper "26.1")
 (defvar smerge-upper-face 'smerge-upper)
@@ -92,7 +92,7 @@ Used in `smerge-diff-base-upper' and related functions."
     (((class color) (min-colors 88) (background dark))
      :background "#335533" :extend t)
     (((class color))
-     :foreground "green"))
+     :foreground "green" :extend))
   "Face for the `lower' version of a conflict.")
 (define-obsolete-face-alias 'smerge-other 'smerge-lower "26.1")
 (defvar smerge-lower-face 'smerge-lower)
@@ -103,7 +103,7 @@ Used in `smerge-diff-base-upper' and related functions."
     (((class color) (min-colors 88) (background dark))
      :background "#888833" :extend t)
     (((class color))
-     :foreground "yellow"))
+     :foreground "yellow" :extend t))
   "Face for the base code.")
 (defvar smerge-base-face 'smerge-base)