Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

3 files changed, 14 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2189fac6a05..9c2582cb0f4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-08  Leo Liu  <sdl.web@gmail.com>
+
+        * themes/deeper-blue-theme.el: Use another fix.  (Bug#17695)
+
 2014-06-08  Juri Linkov  <juri@jurta.org>
 
         * themes/deeper-blue-theme.el (diff-added, diff-changed, diff-removed):
diff --git a/etc/NEWS b/etc/NEWS
index dd802b94b21..cfda70f62a8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -547,6 +547,10 @@ conventions.  To use it, add it to the `fill-nobreak-predicate' hook.
 
 +++
 ** Uniquify is enabled by default, with `post-forward-angle-brackets' style.
+In other words, if you visit two files that have the same base name,
+then rather than creating buffers basename and basename<2>,
+Emacs uses basename<dirA> and basename<dirB>.  To change this,
+customize `uniquify-buffer-name-style'.  Set it to nil for the old behavior.
 
 +++
 ** New command `C-x SPC' (`rectangle-mark-mode') makes a rectangular region.
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index 95f9c260260..3b5ab4ccccd 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 (:foreground "white" :background "darkolivegreen"))))
-   `(diff-changed ((,class (:foreground "white" :background "dodgerblue4"))))
+   ;; `(diff-added ((,class (nil))))
+   ;; `(diff-changed ((,class (nil))))
    `(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 (:inherit diff-added))))
-   `(diff-indicator-changed ((,class (:inherit diff-changed))))
-   `(diff-indicator-removed ((,class (:inherit diff-removed))))
+   `(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-refine-change ((,class (:background "skyblue4"))))
-   `(diff-removed ((,class (:foreground "white" :background "indianred4"))))
+   ;; `(diff-removed ((,class (nil))))
    `(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"))))