aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2011-08-15 22:58:30 -0700
committerPaul Eggert2011-08-15 22:58:30 -0700
commit3f74064edab68e5620fade9b802e863cb110afd2 (patch)
tree5631c5c98220f0a63f8552996e576b435e5b41ae /etc
parentfe5c5d37807dbf2d224de5fe9cf821d8292112b1 (diff)
parent04963aa8ff62058b9795c3e3217630515470fcff (diff)
downloademacs-3f74064edab68e5620fade9b802e863cb110afd2.tar.gz
emacs-3f74064edab68e5620fade9b802e863cb110afd2.zip
Merge from trunk.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 1a788e7f6f9..8707a8b0adc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -820,6 +820,11 @@ on a D-Bus without simultaneously registering a property or a method.
820*** The option `ange-ftp-binary-file-name-regexp' has changed its 820*** The option `ange-ftp-binary-file-name-regexp' has changed its
821default value to "". 821default value to "".
822 822
823** Rmail
824
825*** The command `rmail-epa-decrypt' decrypts OpenPGP data
826in the Rmail incoming message.
827
823** VC and related modes 828** VC and related modes
824 829
825*** Support for pulling on distributed version control systems. 830*** Support for pulling on distributed version control systems.