Merge from emacs--rel--22

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

2 files changed, 18 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3998111475d..7e5edd426c3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-16  Jason Rumney  <jasonr@gnu.org>
+
+        * admin.el (set-version): Set version in nt/emacsclient.rc
+
 2008-08-06  Juanma Barranquero  <lekktu@gmail.com>
 
         * nt/dump.bat: Fix mixed EOLs.
diff --git a/admin/admin.el b/admin/admin.el
index 26072ead86f..d30583cd07c 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -123,6 +123,20 @@ Root must be the root of an Emacs source tree."
     (set-version-in-file root "nt/emacs.rc" comma-space-version
                          (rx (and "\"ProductVersion\"" (0+ space) ?,
                                   (0+ space) ?\" (submatch (1+ (in "0-9, ")))
+                                  "\\0\"")))
+    ;; Likewise for emacsclient.rc
+    (set-version-in-file root "nt/emacsclient.rc" comma-version
+                         (rx (and "FILEVERSION" (1+ space)
+                                  (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacsclient.rc" comma-version
+                         (rx (and "PRODUCTVERSION" (1+ space)
+                                  (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacsclient.rc" comma-space-version
+                         (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space)
+                                  ?\" (submatch (1+ (in "0-9, "))) "\\0\"")))
+    (set-version-in-file root "nt/emacsclient.rc" comma-space-version
+                         (rx (and "\"ProductVersion\"" (0+ space) ?,
+                                  (0+ space) ?\" (submatch (1+ (in "0-9, ")))
                                   "\\0\""))))
   ;; nextstep.
   (set-version-in-file