merge upstream

2 files changed, 34 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 109124af4ee..062edbe42a4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-21  Leo Liu  <sdl.web@gmail.com>
+
+        * NEWS: Mention the new primtive secure-hash.
+
 2011-06-14  Chong Yidong  <cyd@stupidchicken.com>
 
         * themes/dichromacy-theme.el: New theme.
diff --git a/etc/NEWS b/etc/NEWS
index dad42e14f02..243058a46b2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -109,6 +109,26 @@ and pops down the *Completions* buffer accordingly.
 
 ** auto-mode-case-fold is now enabled by default.
 
+** smtpmail changes
+
+** smtpmail has been largely rewritten to upgrade to STARTTLS if
+possible, and uses the auth-source framework for getting credentials.
+The rewrite should be largely compatible with previous versions of
+smtpmail, but there are two major incompatibilities:
+
+** `smtpmail-auth-credentials' no longer exists.  That variable could
+be either ~/.authinfo (in which case you're fine -- you won't see any
+difference), but if it were a direct list of user names and passwords,
+you will be prompted for the user name and the password instead, and
+they will then be saved to ~/.authinfo.
+
+** Similarly, if you had `smtpmail-starttls-credentials' set, then
+then you need to put
+
+machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert"
+
+in your ~/.authinfo file instead.
+
 ** Internationalization changes
 
 +++
@@ -305,10 +325,16 @@ If you need it, feedmail.el ought to provide a superset of the functionality.
 
 ** The variable `focus-follows-mouse' now always defaults to nil.
 
-** Function `sha1' is now implemented in C for speed.
+** New primitive `secure-hash' that supports many secure hash algorithms
+including md5, sha-1 and sha-2 (sha-224, sha-256, sha-384 and sha-512).
 The elisp implementation sha1.el is removed. Feature sha1 is provided
 by default.
 
+** Menu-bar changes
+
+*** `menu-bar-select-buffer-function' lets you choose another operation
+instead of `switch-to-buffer' when selecting an item in the Buffers menu.
+
 
 * Editing Changes in Emacs 24.1
 
@@ -1051,6 +1077,9 @@ deferring warnings until the main command loop is executed.
 ** `set-auto-mode' now respects mode: local variables at the end of files,
 as well as those in the -*- line.
 
+---
+** rx.el has a new `group-n' construct for explicitly numbered groups.
+
 
 * Changes in Emacs 24.1 on non-free operating systems