From: Chong Yidong Date: Mon, 26 Sep 2011 03:02:21 +0000 (-0400) Subject: * admin.el (set-version): Fix regexps for config.nt and sed2v2.inp. X-Git-Tag: emacs-pretest-24.0.90~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0c6445257576d75a85810dd93e020105d7ac17c;p=emacs.git * admin.el (set-version): Fix regexps for config.nt and sed2v2.inp. --- diff --git a/admin/ChangeLog b/admin/ChangeLog index 9856f38fabb..7648b2a8455 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2011-09-26 Chong Yidong + + * admin.el (set-version): Fix regexps for config.nt and + sed2v2.inp. + 2011-09-06 Paul Eggert Merge from gnulib (Bug#9169). diff --git a/admin/admin.el b/admin/admin.el index 70958ce1a76..673d86c8825 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -75,11 +75,11 @@ Root must be the root of an Emacs source tree." (submatch (1+ (in "0-9.")))))) (set-version-in-file root "nt/config.nt" version (rx (and bol "#" (0+ blank) "define" (1+ blank) - "VERSION" (1+ blank) + "VERSION" (1+ blank) "\"" (submatch (1+ (in "0-9.")))))) (set-version-in-file root "msdos/sed2v2.inp" version (rx (and bol "/^#undef " (1+ not-newline) - "define VERSION" (1+ space) + "define VERSION" (1+ space) "\"" (submatch (1+ (in "0-9.")))))) (set-version-in-file root "nt/makefile.w32-in" version (rx (and "VERSION" (0+ space) "=" (0+ space)