Merge from emacs-24; up to 2014-06-01T23:37:[email protected]

4 files changed, 37 insertions, 9 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index a06b89d373..2189fac6a0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-08  Juri Linkov  <[email protected]>
+
+	* themes/deeper-blue-theme.el (diff-added, diff-changed, diff-removed):
+	Set face definitions explicitly.  Inherit indicator faces from them.
+	(Bug#17695)
+
 2014-05-28  Reuben Thomas  <[email protected]>
 
 	* TODO: add a note that undo-tree could be used to save undo
diff --git a/etc/NEWS b/etc/NEWS
index b75a8a9d05..dd802b94b2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -962,6 +962,24 @@ Use `electric-indent-mode' instead.
 ** Package
 
 +++
+*** The package library now supports digital signing of packages.
+Maintainers of package archives should consider signing their packages
+to enhance security.
+
++++
+**** If the user option `package-check-signature' is non-nil,
+Emacs tries to check package signatures at install time.
+The value `allow-unsigned' allows installation of unsigned packages.
+
++++
+**** The user option `package-unsigned-archives' lists archives where
+Emacs will not try to check signatures.
+
++++
+*** New option `package-pinned-packages'.  This is useful if you have multiple
+archives enabled, with more than one offering a package that you want.
+
++++
 *** In the `list-packages' buffer, you can use `f' (`package-menu-filter')
 to filter the list of packages by a keyword.
 
@@ -1276,6 +1294,12 @@ low-level libraries gfilenotify.c, inotify.c or w32notify.c.
 
 * Incompatible Lisp Changes in Emacs 24.4
 
++++
+** Do not assume that the priority of all overlays will be numeric.
+(You should still only specify integer priorities on overlays you create.)
+If you need to sort arbitrary overlays into priority order, `overlays-at'
+can now optionally do this.
+
 ---
 ** `kill-region' has lost its `yank-handler' optional argument.
 
@@ -1375,8 +1399,6 @@ the other.
 
 * Lisp Changes in Emacs 24.4
 
-** overlays-at can optionally sort its result by priority.
-
 +++
 ** The second argument of `eval' can now specify a lexical environment.
 
diff --git a/etc/TODO b/etc/TODO
index 31e5429743..4c7955c979 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -659,7 +659,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 1e1a8b4cc9..95f9c26026 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"))))