merge upstream

3 files changed, 32 insertions, 3 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index bfe584c69a1..d56523167d9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-17  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.93.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.2.93.
+
+2011-07-16  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.92.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.2.92.
+
 2011-07-12  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.2.91.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index a46354d7b7b..e61d1d93603 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,16 @@
 Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.2.93
+
+Version 8.2.93 reverts back to using `switch-to-buffer' which the
+Emacs developers decided was fine to call from programs after all.
+
+* Changes in MH-E 8.2.92
+
+Version 8.2.92 actually corrects the error in the modeline glyph when
+running XEmacs 21.5.31 in a terminal.
+
 * Changes in MH-E 8.2.91
 
 Version 8.2.91 fixes the folder window problem that was introduced
@@ -14,8 +24,6 @@ from SourceForge and explicitly load MH-E will have to be change their
 `load-path' to "/path/to/mh-e/emacs/trunk/lisp/mh-e" instead. Note the
 addition of "trunk."
 
-This version of MH-E is packaged with GNU Emacs 24.1
-
 * Changes in MH-E 8.2.90
 
 In 2010, the version control system (VCS) of Emacs was upgraded from
@@ -32,6 +40,15 @@ meaning that `+f/b/b TAB' can complete to `+foo/bar/baz'.
 Also, RFC 2047-encoded Subject header fields in replies are now
 decoded.
 
+This version of MH-E is packaged with GNU Emacs 24.1
+
+** Bug Fixes in MH-E 8.2.90
+
+*** Make mh-showing a legitimate minor mode
+
+The `mh-showing-mode' variable is now defined with `define-minor-mode'
+(closes SF #482666).
+
 
 
 * Changes in MH-E 8.2
diff --git a/etc/NEWS b/etc/NEWS
index 11acbd8c42d..278fbea81c1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -488,7 +488,7 @@ $ESHELL nor variable `explicit-shell-file-name' is set.
 
 ** MH-E
 
-*** Upgraded to MH-E version 8.2.91.  See MH-E-NEWS for details.
+*** Upgraded to MH-E version 8.2.93.  See MH-E-NEWS for details.
 
 ** comint and modes derived from it use the generic completion code.