From: Bruno Haible <bruno@clisp.org>
Date: Thu, 1 Nov 2001 22:51:15 +0000 (+0000)
Subject: Recognize prerelease versions of msgfmt.
X-Git-Tag: v0.11~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5a8518076746ff23ccbbd6319f6d26d97b5a95b;p=thirdparty%2Fgettext.git

Recognize prerelease versions of msgfmt.
---

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 99a34b7b6..512cc8022 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-01  Karl Eichwalder  <ke@suse.de>
+
+	* po-mode.el (po-msgfmt-version-check): Also accept pre-release
+	versions.
+
 2001-10-31  Bruno Haible  <haible@clisp.cons.org>
 
 	* gettextize.in: Renamed COPYING.LIB-2 to COPYING.LIB-2.0.
diff --git a/misc/po-mode.el b/misc/po-mode.el
index 20aa0ccf7..1ff687a44 100644
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -3009,10 +3009,12 @@ Leave point after marked string."
 			nil t nil "--verbose" "--version")
 	(file-error nil))
 
-      ;; Make sure there's a version number in the output: 0.11 or 0.10.36
+      ;; Make sure there's a version number in the output:
+      ;; 0.11 or 0.10.36 or 0.11-pre1
       (progn (goto-char (point-min))
              (or (looking-at ".* \\([0-9]+\\)\\.\\([0-9]+\\)$")
-                 (looking-at ".* \\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$")))
+                 (looking-at ".* \\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$")
+		 (looking-at ".* \\([0-9]+\\)\\.\\([0-9]+\\)[-_A-Za-z0-9]+$")))
 
       ;; Make sure the version is recent enough.
       (>= (string-to-number