Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-88

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 569-579)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 129-132)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0

3 files changed, 36 insertions, 3 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 9821c98c8dd..3515f78d04a 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -27,8 +27,6 @@ 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]
@@ -67,6 +65,8 @@ back burner waiting for a legal comment or an alternate implementation
 
 * BUGS
 
+* Pierre Albarede's Aug 30 bug report about C-v and long lines.
+
 ** Make a new interface for specifying window configurations
 so that we can fix bugs in balance-windows.
 
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.