Merge from trunk.

3 files changed, 43 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 1a9771a960a..bfe584c69a1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-12  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.91.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.2.91.
+
+        * MH-E-NEWS: Mention that SourceForge MH-E users will have to
+        update their load-paths.
+
 2011-07-10  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.2.90.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 0db76bb1237..a46354d7b7b 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,18 @@
 Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.2.91
+
+Version 8.2.91 fixes the folder window problem that was introduced
+in 8.2.90. It also fixes compilation warnings in XEmacs 21.5.31, as
+well as an error when running XEmacs 21.5.31 in a terminal.
+
+Another implication of the VCS change is that users who download MH-E
+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
 
@@ -15,8 +27,7 @@ scripts.
 Otherwise, this is a small release that includes mostly internal
 changes from the Emacs team. One of these changes manifests itself in
 the user interface--you can now complete folders with abbreviations,
-meaning that `+f/b/b TAB' can complete to `+foo/bar/baz'. This version
-of MH-E is packaged with GNU Emacs 24.1
+meaning that `+f/b/b TAB' can complete to `+foo/bar/baz'.
 
 Also, RFC 2047-encoded Subject header fields in replies are now
 decoded.
diff --git a/etc/NEWS b/etc/NEWS
index c32159f6540..8a37735b41f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -58,13 +58,16 @@ automatically select it.
 
 * Startup Changes in Emacs 24.1
 
+---
 ** The --unibyte, --multibyte, --no-multibyte, and --no-unibyte
 command line arguments, and the EMACS_UNIBYTE environment variable, no
 longer have any effect.  (They were declared obsolete in Emacs 23.)
 
++++
 ** New command line option `--no-site-lisp' removes site-lisp directories
 from load-path.  -Q now implies this.
 
+---
 ** On Windows, Emacs now warns when the obsolete _emacs init file is used,
 and also when HOME is set to C:\ by default.
 
@@ -77,6 +80,7 @@ pops up *Messages*" feature, which can now easily be changed.
 
 ** emacsclient changes
 
++++
 *** New emacsclient argument --parent-id ID can be used to open a
 client frame in parent X window ID, via XEmbed.  This works like the
 --parent-id argument to Emacs.
@@ -88,10 +92,12 @@ client frame in parent X window ID, via XEmbed.  This works like the
 *** New emacsclient argument --frame-parameters can be used to set the
 frame parameters of a newly-created graphical frame.
 
++++
 *** If emacsclient shuts down as a result of Emacs signalling an
 error, its exit status is 1.
 
 ** Completion
+
 *** shell-mode uses pcomplete rules, with the standard completion UI.
 
 *** Many packages have been changed to use completion-at-point rather than
@@ -353,6 +359,7 @@ replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 ** The standalone program `fakemail' has been removed.
 If you need it, feedmail.el ought to provide a superset of the functionality.
 
++++
 ** The variable `focus-follows-mouse' now always defaults to nil.
 
 ** New primitive `secure-hash' that supports many secure hash algorithms
@@ -419,42 +426,52 @@ use the primary selection.
 In the following, we provide a list of these changes, followed by a
 list of steps to get the old behavior back if you prefer that.
 
-*** `mouse-drag-copy-region' now defaults to nil.
++++
 *** `select-active-regions' now defaults to t.
 Merely selecting text (e.g. with drag-mouse-1) no longer puts it in
-the kill-ring.  The selected text is put in the primary selection, if
+the kill ring.  The selected text is put in the primary selection, if
 the system possesses a separate primary selection facility (e.g. X).
 
++++
 **** `select-active-regions' also accepts a new value, `only'.
 This means to only set the primary selection for temporarily active
 regions (usually made by mouse-dragging or shift-selection);
 "ordinary" active regions, such as those made with C-SPC followed by
 point motion, do not alter the primary selection.
 
+---
+**** `mouse-drag-copy-region' now defaults to nil.
+
++++
 *** mouse-2 is now bound to `mouse-yank-primary'.
 This pastes from the primary selection, ignoring the kill-ring.
 Previously, mouse-2 was bound to `mouse-yank-at-click'.
 
++++
 *** `x-select-enable-clipboard' now defaults to t on all platforms.
++++
 *** `x-select-enable-primary' now defaults to nil.
 Thus, commands that kill text or copy it to the kill-ring (such as
 M-w, C-w, and C-k) also use the clipboard---not the primary selection.
 
+---
 **** The "Copy", "Cut", and "Paste" items in the "Edit" menu are now
 exactly equivalent to, respectively M-w, C-w, and C-y.
 
+---
 **** Note that on MS-Windows, `x-select-enable-clipboard' was already
 non-nil by default, as Windows does not support the primary selection
 between applications.
 
+---
 *** To return to the previous behavior, do the following:
-
 **** Change `select-active-regions' to nil.
 **** Change `mouse-drag-copy-region' to t.
 **** Change `x-select-enable-primary' to t (on X only).
 **** Change `x-select-enable-clipboard' to nil.
 **** Bind `mouse-yank-at-click' to mouse-2.
 
++++
 *** Support for X cut buffers has been removed.
 
 *** Support for X clipboard managers has been added.
@@ -475,7 +492,7 @@ $ESHELL nor variable `explicit-shell-file-name' is set.
 
 ** MH-E
 
-*** Upgraded to MH-E version 8.2.90.  See MH-E-NEWS for details.
+*** Upgraded to MH-E version 8.2.91.  See MH-E-NEWS for details.
 
 ** comint and modes derived from it use the generic completion code.