summaryrefslogtreecommitdiff
path: root/etc/themes
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-05-16 10:29:14 -0700
committerGlenn Morris <rgm@gnu.org>2020-05-16 10:29:14 -0700
commit788c2480f448e97773172f3e840976dbcdc3e6c8 (patch)
tree60d3425a657e682da7790fc5f0d2548995721ef2 /etc/themes
parenta67415a71a1be5419547ac5e2abe51bc6bb37f1d (diff)
parentb4937f64cd97ff6bf93538987c014f8ea8ff9d34 (diff)
downloademacs-788c2480f448e97773172f3e840976dbcdc3e6c8.tar.gz
Merge from origin/emacs-27
b4937f64cd (origin/emacs-27) Improve documentation of manually instal... efd4e973a4 Reflect the emacs-devel ELPA/MELPA dispute in FAQ 28541674cd Consider face inheritance when checking region face backgr... e75f6be6cc Fix dired default file operation (bug#41261) 406fb0746c Fix documentation related to 'command-switch-alist'. 747e0a2523 Improve ediff readability in misterioso theme (Bug#41221) 48830c73e7 Fix a crash in handle_display_spec a37290a6f9 In x_hide_tip reset tip_last_frame for GTK+ tooltips only ... 3d81995692 Fix docstring of flymake-make-diagnostic (bug#40351) 632aa9d57a Go back to “Bahá’í” e2406ff60f * lisp/dired.el (dired-toggle-marks): Doc fix. (Bug#41097) # Conflicts: # doc/emacs/building.texi
Diffstat (limited to 'etc/themes')
-rw-r--r--etc/themes/misterioso-theme.el7
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
index 8161dbd9e94..ff9af0c7440 100644
--- a/etc/themes/misterioso-theme.el
+++ b/etc/themes/misterioso-theme.el
@@ -63,6 +63,13 @@
`(button ((,class (:underline t))))
`(link ((,class (:foreground "#59e9ff" :underline t))))
`(link-visited ((,class (:foreground "#ed74cd" :underline t))))
+ ;; Ediff
+ `(ediff-even-diff-A ((,class (:background "#1d2430"))))
+ `(ediff-even-diff-B ((,class (:background "#1d2430"))))
+ `(ediff-even-diff-C ((,class (:background "#1d2430"))))
+ `(ediff-odd-diff-A ((,class (:background "#415160"))))
+ `(ediff-odd-diff-B ((,class (:background "#415160"))))
+ `(ediff-odd-diff-C ((,class (:background "#415160"))))
;; Gnus faces
`(gnus-group-news-1 ((,class (:foreground "#ff4242" :weight bold))))
`(gnus-group-news-1-low ((,class (:foreground "#ff4242"))))