Merge from mainline.

2 files changed, 28 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index adb782cd13a..f845ab98bf0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Add secrets.el.
+
 2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * images/custom/down.xpm, images/custom/right.xpm: Update images
diff --git a/etc/NEWS b/etc/NEWS
index 9864f7715be..317f5cedf24 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -24,13 +24,19 @@ so we will look at it and add it to the manual.
 
 * Installation Changes in Emacs 24.1
 
+---
+** There are new configure options:
+--with-mmdf, --with-mail-unlink, --with-mailhost.
+These provide no new functionality, they just remove the need to edit
+lib-src/Makefile by hand in order to use the associated features.
+
 
 * Startup Changes in Emacs 24.1
 
 
 * Changes in Emacs 24.1
 
-** The scroll-bar is now on the right on GNU/Linux and UNIX-like systems.
+** GTK scroll-bars are now placed on the right by default.
 Use `set-scroll-bar-mode' to change this.
 
 
@@ -57,14 +63,31 @@ choose a color via list-colors-display.
 
 *** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
 
+*** Special markup can be added to log-edit buffers.
+
+**** For Bzr, adding an
+Author: NAME
+line will add "--author NAME" to the "bzr commit" command.
+
+**** For Hg, adding an
+Author: NAME
+line will add "--user NAME" to the "hg commit" command.
+
 ** Directory local variables can apply to file-less buffers.
 For example, adding "(diff-mode . ((mode . whitespace)))" to your
 .dir-locals.el file, will turn on `whitespace-mode' for *vc-diff*
 buffers.
 
+** s-region.el is now declared obsolete, superceded by shift-select-mode
+enabled by default in 23.1.
+
 
 * New Modes and Packages in Emacs 24.1
 
+** secrets.el is an implementation of the Secret Service API, an
+interface to password managers like GNOME Keyring or KDE Wallet.  The
+Secret Service API requires D-Bus for communication.
+
 
 * Incompatible Lisp Changes in Emacs 24.1