Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-551
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-552
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-553
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-554
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-555
   Remove CVS keywords from newsticker files

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-556
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-557
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-558
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-559
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-560
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-561
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-562
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-563
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-565
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-566
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-567
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-568
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-569
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-570
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-571
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-573
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-574
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-575
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-576
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-577
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-118
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-119
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-120
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-121
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-122
   Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-123
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-124
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-125
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-126
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-127
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-128
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-129
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-130
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-131
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-132
   Update from CVS

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

3 files changed, 58 insertions, 50 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3f6f6aee58a..df7954d73bb 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-01  Jason Rumney  <jasonr@gnu.org>
+
+        * admin.el (set-version): Set version numbers in nt/emacs.rc.
+
 2005-08-31  Romain Francoise  <romain@orebokech.com>
 
         * FOR-RELEASE: (New features): Remove vhdl-mode.el update
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index fe1bad8241c..3515f78d04a 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -27,7 +27,24 @@ face name prefixes should be in it for good results.
 
 * NEW FEATURES
 
-** Update Speedbar.
+** Rework how the fringe "angle" bitmap at at bottom of buffer is
+shown to include an indication of whether the last line has a NL or not.
+[Assigned to KFS]
+
+** Rework how fringe bitmaps are defined and used.
+Currently, bitmap usage and bitmap appearence are "mixed-up" in a
+one-level representation.  It would be cleaner to split the
+representation into a two-level model where first level maps
+bitmap usage to a bitmap name, and second level maps bitmap name to
+a bitmap appearence.
+[Assigned to KFS]
+
+** Put a max-limit on the size of images, e.g. based on the display size.
+This is to avoid allocating insane amounts of memory due to bogus
+image size specifications.
+Note: rather than clipping images that are too big (this may be
+non-trivial to do correctly in all cases -- and thus non-trivial to
+test), it may be better just to avoid displaying such images for emacs 22.
 
 * FATAL ERRORS
 
@@ -48,59 +65,17 @@ back burner waiting for a legal comment or an alternate implementation
 
 * BUGS
 
-** Fix recognition of shell's `dirs' command.
+* Pierre Albarede's Aug 30 bug report about C-v and long lines.
 
-Is his change right?
-
-Date: Wed, 29 Jun 2005 18:21:28 -0500 (CDT)
-From: kevin.gal@verizon.net
-
-When I use tcsh (which echoes command input) in a shell buffer,
-entering "M-x dirs" fails because it mistakens the echoed "dirs"
-string as the directory string to use as input when changing the
-buffers default directory.  The attached gziped patch file contains a
-fix.  The patch also binds the "dirs" command to "\e\C-m" in
-shell-mode-map (previously unbound) to make it easy to invoke.
-Finally, a test has been added to see if "shell-dirstack-query" is
-non-nil.  If so, it is not overwritten.
-
-To enable the fix, the user must set comint-process-echoes to t.
+** Make a new interface for specifying window configurations
+so that we can fix bugs in balance-windows.
 
 ** TCP server processes do not work on Windows.
 
 TCP/IP server processes created with `make-network-process' consume
 excesive CPU on some Windows environments.  Usages of 50% and 100%
 CPU time have been observed on different Window XP configurations.
-
-** Bug in ebrowse
-
-Date: Fri, 27 May 2005 17:35:48 +0200
-From: Markus Gritsch <gritsch@iue.tuwien.ac.at>
-
-the C++ header file which led to the problematic BROWSE file reads
-
-namespace test {
-     class Base
-     {
-     };
-
-     class B : public Base
-     {
-     };
-}
-
-class A : public test::Base
-{
-};
-
-The *Tree* is then displayed as
-
-   *Globals*
-   test
-   test::Base
-     test::B
-
-The class A seems to be missing.
+Seems to be a problem in sys_select in w32proc.c.
 
 * DOCUMENTATION
 
@@ -221,7 +196,7 @@ lispref/debugging.texi   Joakim Verona <joakim@verona.se>   Lute Kamstra
 lispref/display.texi     Chong Yidong
 lispref/edebug.texi      Chong Yidong      "Luc Teirlinck"
 lispref/elisp.texi       "Luc Teirlinck"   Lute Kamstra
-lispref/errors.texi      "Luc Teirlinck"
+lispref/errors.texi      "Luc Teirlinck"   Chong Yidong
 lispref/eval.texi        "Luc Teirlinck"   Chong Yidong
 lispref/files.texi       "Luc Teirlinck"   Chong Yidong
 lispref/frames.texi      "Luc Teirlinck"   Chong Yidong
@@ -236,7 +211,7 @@ lispref/lists.texi	 "Luc Teirlinck"   Chong Yidong
 lispref/loading.texi     "Luc Teirlinck"   Chong Yidong
 lispref/locals.texi      Chong Yidong
 lispref/macros.texi      "Luc Teirlinck"   Chong Yidong
-lispref/maps.texi
+lispref/maps.texi        Chong Yidong
 lispref/markers.texi     "Luc Teirlinck"   Chong Yidong
 lispref/minibuf.texi     "Luc Teirlinck"   Chong Yidong
 lispref/modes.texi       Chong Yidong
diff --git a/admin/admin.el b/admin/admin.el
index 3969345cc32..2f7f085b9d9 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -87,7 +87,36 @@ Root must be the root of an Emacs source tree."
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "lispref/elisp.texi" version
                        (rx (and "EMACSVER" (1+ space)
-                                (submatch (1+ (in "0-9.")))))))
+                                (submatch (1+ (in "0-9."))))))
+  ;; nt/emacs.rc also contains the version number, but in an awkward
+  ;; format. It must contain four components, separated by commas, and
+  ;; in two places those commas are followed by space, in two other
+  ;; places they are not.
+  (let* ((version-components (append (split-string version "\\.")
+                                    '("0" "0")))
+         (comma-version
+          (concat (car version-components) ","
+                  (cadr version-components) ","
+                  (cadr (cdr version-components)) "," 
+                  (cadr (cdr (cdr version-components)))))
+         (comma-space-version
+          (concat (car version-components) ", "
+                  (cadr version-components) ", "
+                  (cadr (cdr version-components)) ", " 
+                  (cadr (cdr (cdr version-components))))))
+    (set-version-in-file root "nt/emacs.rc" comma-version
+                         (rx (and "FILEVERSION" (1+ space)
+                                  (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacs.rc" comma-version
+                         (rx (and "PRODUCTVERSION" (1+ space)
+                                  (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacs.rc" comma-space-version
+                         (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space)
+                                  ?\" (submatch (1+ (in "0-9, "))) "\\0\"")))
+    (set-version-in-file root "nt/emacs.rc" comma-space-version
+                         (rx (and "\"ProductVersion\"" (0+ space) ?,
+                                  (0+ space) ?\" (submatch (1+ (in "0-9, ")))
+                                  "\\0\"")))))
 
 ;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
 ;; admin.el ends here.