aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc/diff-mode.el
diff options
context:
space:
mode:
authorEli Zaretskii2019-11-30 13:27:11 +0200
committerEli Zaretskii2019-11-30 13:27:11 +0200
commit64687872f62e7837340b77697d4ccd4f60caaae0 (patch)
treebf42f6eef4ea64420edba2395ae77914c69a82fd /lisp/vc/diff-mode.el
parentabd3dd3a467fd93ac66db1a13b31787d88a95d55 (diff)
downloademacs-64687872f62e7837340b77697d4ccd4f60caaae0.tar.gz
emacs-64687872f62e7837340b77697d4ccd4f60caaae0.zip
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.
Diffstat (limited to 'lisp/vc/diff-mode.el')
-rw-r--r--lisp/vc/diff-mode.el12
1 files changed, 6 insertions, 6 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."
302 (((class color) (min-colors 88) (background dark)) 302 (((class color) (min-colors 88) (background dark))
303 :background "grey45" :extend t) 303 :background "grey45" :extend t)
304 (((class color)) 304 (((class color))
305 :foreground "blue1" :weight bold) 305 :foreground "blue1" :weight bold :extend t)
306 (t :weight bold)) 306 (t :weight bold :extend t))
307 "`diff-mode' face inherited by hunk and index header faces.") 307 "`diff-mode' face inherited by hunk and index header faces.")
308 308
309(defface diff-file-header 309(defface diff-file-header
@@ -312,8 +312,8 @@ well."
312 (((class color) (min-colors 88) (background dark)) 312 (((class color) (min-colors 88) (background dark))
313 :background "grey60" :weight bold :extend t) 313 :background "grey60" :weight bold :extend t)
314 (((class color)) 314 (((class color))
315 :foreground "cyan" :weight bold) 315 :foreground "cyan" :weight bold :extend t)
316 (t :weight bold)) ; :height 1.3 316 (t :weight bold :extend t)) ; :height 1.3
317 "`diff-mode' face used to highlight file header lines.") 317 "`diff-mode' face used to highlight file header lines.")
318 318
319(defface diff-index 319(defface diff-index
@@ -334,7 +334,7 @@ well."
334 (((class color) (min-colors 88) (background dark)) 334 (((class color) (min-colors 88) (background dark))
335 :background "#553333" :extend t) 335 :background "#553333" :extend t)
336 (((class color)) 336 (((class color))
337 :foreground "red")) 337 :foreground "red" :extend t))
338 "`diff-mode' face used to highlight removed lines.") 338 "`diff-mode' face used to highlight removed lines.")
339 339
340(defface diff-added 340(defface diff-added
@@ -347,7 +347,7 @@ well."
347 (((class color) (min-colors 88) (background dark)) 347 (((class color) (min-colors 88) (background dark))
348 :background "#335533" :extend t) 348 :background "#335533" :extend t)
349 (((class color)) 349 (((class color))
350 :foreground "green")) 350 :foreground "green" :extend t))
351 "`diff-mode' face used to highlight added lines.") 351 "`diff-mode' face used to highlight added lines.")
352 352
353(defface diff-changed 353(defface diff-changed