Recognize prerelease versions of msgfmt.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 99a34b7b689df916da7f68f8cb7f38e283f84dae..512cc8022093707abfc0065e73903b17c95450c0 100644 (file)
--- 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 20aa0ccf79d6093143a1b6dbdf73edbfe057487c..1ff687a44db6a914de3d62818a0952968cf287b0 100644 (file)
--- 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