Merge from emacs-24; up to 2014-07-12T04:06:32Z!dmantipov@yandex.ru.

2 files changed, 23 insertions, 1 deletions

diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index f4308cedfbc..012c3729f75 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,28 @@
 Copyright (C) 2001-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.6
+
+Version 8.6 fixes composition errors in nmh 1.6.
+
+** Bug Fixes in MH-E 8.6
+
+*** Add support for nmh 1.5
+
+A components file is now generated that works with nmh 1.5 (partially
+closes SF #468).
+        
+*** Error if mh-x-face-file is nil
+
+Ensure that `mh-x-face-file' is a string before trying to use it
+(closes SF #474).
+
+*** MH-Folder buffer includes "scan: bad message list unseen"
+
+Fix this error (closes SF #471).
+
+
+
 * Changes in MH-E 8.5
 
 Version 8.5 fixes bugs when incorporating or forwarding mail.
diff --git a/etc/NEWS b/etc/NEWS
index 6f9bf83a8b1..59842fa7eee 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -918,7 +918,7 @@ are lined up to the first one.
 
 *** Recognition and better indentation of continuations in array comprehensions.
 
-** MH-E has been updated to version 8.5 - see separate MH-E-NEWS file.
+** MH-E has been updated to version 8.6 - see separate MH-E-NEWS file.
 
 ** Octave mode