Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 125-127)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-896

diff --cc doc/emacs/ChangeLog
index 6fc359f,aa61bec..68c150a
--- 1/doc/emacs/ChangeLog
--- 2/man/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,20 -1,7 +1,24 @@@
+ 2007-10-18  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * trouble.texi (Quitting): Fix typo.
+ 
 +2007-10-18  Glenn Morris  <rgm@gnu.org>
 +
 +      * frames.texi (Mode Line Mouse): Mention minor mode names.
 +
 +2007-10-17  Juri Linkov  <juri@jurta.org>
 +
 +      * text.texi (Fill Commands): Undocument fill-paragraph-or-region.
 +      fill-paragraph operates on the active region in Transient Mark mode.
 +      (Fill Prefix, Format Indentation): Replace fill-paragraph-or-region
 +      with fill-paragraph.
 +
 +      * basic.texi (Arguments): Replace fill-paragraph-or-region with
 +      fill-paragraph.
 +
 +      * fixit.texi (Spelling): ispell-word operates on the active region
 +      in Transient Mark mode.
 +
  2007-10-17  Aaron S. Hawley  <aaronh@garden.org>
  
        * building.texi (Source Buffers):

diff --cc doc/emacs/trouble.texi
Simple merge

diff --cc etc/NEWS.22
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc nt/ChangeLog
Simple merge

diff --cc nt/makefile.w32-in
Simple merge