Merge from mainline.

3 files changed, 24 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d477f8e3d36..c201772cd93 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-26  Micah Anderson  <micah@riseup.net>  (tiny change)
+
+        * spook.lines: Additions.  (Bug#14658)
+
 2013-07-16  Jan Djärv  <jan.h.d@swipnet.se>
 
         * NEWS: Document blink-cursor-blinks and blink timers stopped.
diff --git a/etc/NEWS b/etc/NEWS
index c472a2be8f3..1cd444e6455 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -158,6 +158,10 @@ You can pick the name of the function and the variables with `C-x 4 a'.
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
+** The debugger's `e' command evaluates the code in the context at point.
+This includes using the lexical environment at point, which means that
+`e' now lets you access lexical variables as well.
+
 ** `eshell' now supports visual subcommands and options
 Eshell has been able to handle "visual" commands (interactive,
 non-line oriented commands such as top that require display
@@ -278,6 +282,22 @@ restoring the window/frame configuration.  Additional options
 If set to a number, this can be used to avoid accidentally paste large
 amounts of data into the ERC input.
 
+** EPA
+
+*** New option `epa-mail-aliases'.
+
+You can set this to a list of alias expansions for keys to use
+in `epa-mail-encrypt'.
+
+If one element of the variable's value is ("foo@bar.com" "foo@hello.org"),
+that means: when one of the recipients of the message being encrypted
+is `foo@bar.com', encrypt the message for `foo@hello.org' instead.
+
+If one element of the variable's value is ("foo@bar.com"),
+that means: when one of the recipients of the message being encrypted
+is `foo@bar.com', ignore that name as regards encryption.
+This is useful to avoid a query when you have no key for that name.
+
 ---
 ** New F90 mode option `f90-smart-end-names'.
 
diff --git a/etc/spook.lines b/etc/spook.lines
index 16bc696e0f3..2a1a0ac1cb9 100644
--- a/etc/spook.lines
+++ b/etc/spook.lines