diff options
| author | Xue Fuqiao <[email protected]> | 2013-07-30 08:29:09 +0800 |
|---|---|---|
| committer | Xue Fuqiao <[email protected]> | 2013-07-30 08:29:09 +0800 |
| commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
| tree | ad6543d8e7f1db50226907f7278373eef544d252 /etc | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
Merge from mainline.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/NEWS | 20 | ||||
| -rw-r--r-- | etc/spook.lines | bin | 9643 -> 12802 bytes |
3 files changed, 24 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index d477f8e3d3..c201772cd9 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2013-07-26 Micah Anderson <[email protected]> (tiny change) + + * spook.lines: Additions. (Bug#14658) + 2013-07-16 Jan Djärv <[email protected]> * NEWS: Document blink-cursor-blinks and blink timers stopped. @@ -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 ("[email protected]" "[email protected]"), +that means: when one of the recipients of the message being encrypted +is `[email protected]', encrypt the message for `[email protected]' instead. + +If one element of the variable's value is ("[email protected]"), +that means: when one of the recipients of the message being encrypted +is `[email protected]', 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 Binary files differindex 16bc696e0f..2a1a0ac1cb 100644 --- a/etc/spook.lines +++ b/etc/spook.lines |