diff options
| -rw-r--r-- | etc/ChangeLog | 6 | ||||
| -rw-r--r-- | etc/TODO | 2 | ||||
| -rw-r--r-- | etc/themes/deeper-blue-theme.el | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index dd703fc8f8e..9bc71271684 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,9 @@ +2014-06-05 Juri Linkov <juri@jurta.org> + + * themes/deeper-blue-theme.el (diff-added, diff-changed, diff-removed): + Set face definitions explicitly. Inherit indicator faces from them. + (Bug#17695) + 2014-05-24 Paul Eggert <eggert@cs.ucla.edu> Specify coding if Latin-1 Emacs would misinterpret (Bug#17575). @@ -651,7 +651,7 @@ rather than interactively. This a trivial one-liner in easy-mode.el. [As of trunk r109635, 2012-08-15, the event loop no longer polls.] **** (mouse-avoidance-mode 'banish) then minimize Emacs, will pop window back -up on top of all others +up on top of all others (probably fixed in bug#17439) **** free_frame_resources, face colors diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el index 1e1a8b4cc98..95f9c260260 100644 --- a/etc/themes/deeper-blue-theme.el +++ b/etc/themes/deeper-blue-theme.el @@ -40,19 +40,19 @@ `(cperl-hash-face ((,class (:foreground "coral1")))) `(cursor ((,class (:background "green")))) `(default ((,class (:background "#181a26" :foreground "gray80")))) - `(diff-added ((,class (nil)))) - `(diff-changed ((,class (nil)))) + `(diff-added ((,class (:foreground "white" :background "darkolivegreen")))) + `(diff-changed ((,class (:foreground "white" :background "dodgerblue4")))) `(diff-context ((,class (:foreground "seashell4")))) `(diff-file-header ((,class (:background "grey60")))) `(diff-function ((,class (:inherit diff-header)))) `(diff-header ((,class (:background "grey45")))) `(diff-hunk-header ((,class (:inherit diff-header)))) `(diff-index ((,class (:inherit diff-file-header)))) - `(diff-indicator-added ((,class (:foreground "white" :background "darkolivegreen")))) - `(diff-indicator-changed ((,class (:foreground "white" :background "dodgerblue4")))) - `(diff-indicator-removed ((,class (:foreground "white" :background "indianred4")))) + `(diff-indicator-added ((,class (:inherit diff-added)))) + `(diff-indicator-changed ((,class (:inherit diff-changed)))) + `(diff-indicator-removed ((,class (:inherit diff-removed)))) `(diff-refine-change ((,class (:background "skyblue4")))) - `(diff-removed ((,class (nil)))) + `(diff-removed ((,class (:foreground "white" :background "indianred4")))) `(dired-marked ((,class (:background "dodgerblue3" :foreground "white")))) `(ediff-current-diff-A ((,class (:background "green4" :foreground "white")))) `(ediff-current-diff-B ((,class (:background "darkorange3" :foreground "white")))) |