Merge from trunk.

2 files changed, 16 insertions, 8 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0dd27a1c0c0..afad0864c84 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-24  Tassilo Horn  <tsdh@gnu.org>
+
+        * themes/tsdh-dark-theme.el (tsdh-dark): Add ido faces and remove
+        :box from outline faces.
+
 2013-04-18  Leo Liu  <sdl.web@gmail.com>
 
         * NEWS: Mention new key ? for describe-prefix-bindings.
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index 879f8f10e8a..7b0c711f3b4 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -65,6 +65,9 @@ Used and created by Tassilo Horn.")
  '(hl-line ((t (:background "grey25"))))
  '(hl-paren-face ((t (:weight bold))) t)
  '(icomplete-first-match ((t (:foreground "deep sky blue" :weight bold))))
+ '(ido-first-match ((t (:foreground "turquoise" :weight bold))))
+ '(ido-only-match ((t (:foreground "medium spring green" :weight bold))))
+ '(ido-subdir ((t (:inherit dired-directory :weight normal))))
  '(lusty-file-face ((t (:foreground "SpringGreen1"))) t)
  '(magit-header ((t (:box 1 :weight bold))))
  '(magit-section-title ((t (:inherit magit-header :background "dark slate blue"))))
@@ -95,14 +98,14 @@ Used and created by Tassilo Horn.")
  '(org-scheduled-previously ((t (:foreground "#FF7400"))))
  '(org-tag ((t (:weight bold))))
  '(org-todo ((t (:foreground "#FF6961" :weight bold))))
- '(outline-1 ((t (:foreground "cyan1" :box (:line-width 1 :color "gainsboro") :weight bold))))
- '(outline-2 ((t (:foreground "SeaGreen1" :box (:line-width 1 :color "gainsboro") :weight bold))))
- '(outline-3 ((t (:foreground "cyan3" :box (:line-width 1 :color "gainsboro") :weight bold))))
- '(outline-4 ((t (:foreground "SeaGreen3" :box (:line-width 1 :color "gainsboro") :weight bold))))
- '(outline-5 ((t (:foreground "LightGoldenrod1" :box (:line-width 1 :color "gainsboro") :weight bold))))
- '(outline-6 ((t (:foreground "light salmon" :box (:line-width 1 :color "gainsboro") :weight bold))))
- '(outline-7 ((t (:foreground "pale goldenrod" :box (:line-width 1 :color "gainsboro") :weight bold))))
- '(outline-8 ((t (:foreground "OliveDrab1" :box (:line-width 1 :color "gainsboro") :weight bold))))
+ '(outline-1 ((t (:foreground "cyan1" :weight bold))))
+ '(outline-2 ((t (:foreground "SeaGreen1" :weight bold))))
+ '(outline-3 ((t (:foreground "cyan3" :weight bold))))
+ '(outline-4 ((t (:foreground "SeaGreen3" :weight bold))))
+ '(outline-5 ((t (:foreground "LightGoldenrod1" :weight bold))))
+ '(outline-6 ((t (:foreground "light salmon" :weight bold))))
+ '(outline-7 ((t (:foreground "pale goldenrod" :weight bold))))
+ '(outline-8 ((t (:foreground "OliveDrab1" :weight bold))))
  '(rcirc-my-nick ((t (:foreground "SpringGreen1" :weight bold))) t)
  '(rcirc-other-nick ((t (:foreground "dodger blue"))) t)
  '(rcirc-track-keyword ((t (:foreground "DodgerBlue" :weight bold))) t)