Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-252
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-253
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-254
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-255
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-256
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-257
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-258
   Clean up lisp/gnus/ChangeLog a bit

 * emacs@sv.gnu.org/emacs--devo--0--patch-259
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-260
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-261
   lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t

 * emacs@sv.gnu.org/emacs--devo--0--patch-262
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-96
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-97
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-98
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-554

3 files changed, 63 insertions, 11 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4e5030d4984..c80b23c0489 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-28  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 7.95.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 7.95.
+
 2006-04-21  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 7.94.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 4b3074686b1..db9de4b9043 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -6,6 +6,19 @@ Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+* Changes in MH-E 7.95
+
+Version 7.95, the second 8.0 release candidate, fixes a single bug.
+It would be good to check this version ASAP since the Emacs pretest is
+coming in days: if no showstopper problems are found in this version
+it will be promoted to 8.0 before the pretest. Thanks for your help!
+
+** Bug Fixes in MH-E 7.95
+
+*** Folder Completion Fails in fcc: Field
+
+This has been fixed (closes SF #1476270).
+
 * Changes in MH-E 7.94
 
 Version 7.94, the first 8.0 release candidate, fixes a bunch of bugs,
diff --git a/etc/NEWS b/etc/NEWS
index 3c02fe82a85..378f715b286 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1404,20 +1404,35 @@ changes.
 There's a new separate package grep.el, with its own submenu and
 customization group.
 
++++
+*** `grep-find' is now also available under the name `find-grep' where
+people knowing `find-grep-dired' would probably expect it.
+
++++
+*** New commands `lgrep' (local grep) and `rgrep' (recursive grep) are
+more user-friendly versions of `grep' and `grep-find', which prompt
+separately for the regular expression to match, the files to search,
+and the base directory for the search (rgrep only).  Case sensitivitivy
+of the search is controlled by the current value of `case-fold-search'.
+
+These commands build the shell commands based on the new variables
+`grep-template' (lgrep) and `grep-find-template' (rgrep).
+
+The files to search can use aliases defined in `grep-files-aliases'.
+
+Subdirectories listed in `grep-find-ignored-directories' such as those
+typically used by various version control systems, like CVS and arch,
+are automatically skipped by `rgrep'.
+
 ---
-*** M-x grep provides highlighting support.
+*** The grep commands provide highlighting support.
 
 Hits are fontified in green, and hits in binary files in orange.  Grep buffers
 can be saved and automatically revisited.
 
-+++
-*** `grep-find' is now also available under the name `find-grep' where
-people knowing `find-grep-dired' would probably expect it.
-
 ---
-*** The new variables `grep-window-height', `grep-auto-highlight', and
-`grep-scroll-output' override the corresponding compilation mode
-settings, for grep commands only.
+*** The new variables `grep-window-height' and `grep-scroll-output' override
+the corresponding compilation mode settings, for grep commands only.
 
 +++
 *** New option `grep-highlight-matches' highlights matches in *grep*
@@ -1952,6 +1967,21 @@ run most curses applications now.
 ** M-x diff uses Diff mode instead of Compilation mode.
 
 +++
+** Diff mode key bindings changed.
+
+These are the new bindings:
+
+C-c C-e   diff-ediff-patch  (old M-A)
+C-c C-n   diff-restrict-view   (old M-r)
+C-c C-r   diff-reverse-direction  (old M-R)
+C-c C-u   diff-context->unified   (old M-U)
+C-c C-w   diff-refine-hunk  (old C-c C-r)
+
+To convert unified to context format, use C-u C-c C-u.
+In addition, C-c C-u now operates on the region
+in Transient Mark mode when the mark is active.
+
++++
 ** You can now customize `fill-nobreak-predicate' to control where
 filling can break lines.  The value is now normally a list of
 functions, but it can also be a single function, for compatibility.
@@ -3025,7 +3055,7 @@ See the file GNUS-NEWS or the node "Oort Gnus" in the Gnus manual for details.
 ---
 ** MH-E changes.
 
-Upgraded to MH-E version 7.94. There have been major changes since
+Upgraded to MH-E version 7.95. There have been major changes since
 version 5.0.2; see MH-E-NEWS for details.
 
 ** Calendar changes:
@@ -3630,9 +3660,10 @@ This is useful in packages that can be preloaded.
 If it is non-nil, the function lists only faces matching this regexp.
 
 +++
-*** New function `string-or-null-p'.
+*** New functions `string-or-null-p' and `booleanp'.
 
-Return t if OBJECT is a string or nil.  Otherwise, return nil.
+`string-or-null-p' returns non-nil iff OBJECT is a string or nil.
+`booleanp' returns non-nil iff OBJECT is a t or nil.
 
 ** Lisp code indentation features:
 
@@ -5877,6 +5908,8 @@ Currently, the following actions have been defined:
 - Mouse-2 on the read-only or modified status in the mode line (`%' or
 `*') toggles the status.
 
+- Mouse-3 on the major mode name displays a major mode menu.
+
 - Mouse-3 on the mode name displays a minor-mode menu.
 
 ** Hourglass pointer