diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2015-07-24 20:23:32 -0400 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-07-27 12:21:55 +0900 |
| commit | 6e86bd9b14df4215146ca2c5e71c744af7c336ec (patch) | |
| tree | 450ea79f189547886c2313ef591b0be1000dc14b | |
| parent | de09fe7fca22e9d1448cdc10e16aecd1953ea4ba (diff) | |
| download | gettext-6e86bd9b14df4215146ca2c5e71c744af7c336ec.tar.gz | |
po-mode: Fix to accept four-part msgfmt version number
| -rw-r--r-- | gettext-tools/misc/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-tools/misc/po-mode.el | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index 304f84db5..8bc50b9a9 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,9 @@ +2015-07-27 Peter Eisentraut <peter@eisentraut.org> (tiny change) + + po-mode: Fix to accept four-part msgfmt version number + * po-mode.el (po-msgfmt-version-check): Accept four-part version + number. + 2015-07-10 Daiki Ueno <ueno@gnu.org> * gettext 0.19.5 released. diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/misc/po-mode.el index a9a19db8b..eb110da99 100644 --- a/gettext-tools/misc/po-mode.el +++ b/gettext-tools/misc/po-mode.el @@ -3390,10 +3390,11 @@ Leave point after marked string." (file-error nil)) ;; Make sure there's a version number in the output: - ;; 0.11 or 0.10.36 or 0.11-pre1 or 0.16.2-pre1 + ;; 0.11 or 0.10.36 or 0.19.5.1 or 0.11-pre1 or 0.16.2-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]+\\)\\.\\([0-9]+\\)$") (looking-at ".* \\([0-9]+\\)\\.\\([0-9]+\\)[-_A-Za-z0-9]+$") (looking-at ".* \\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)[-_A-Za-z0-9]+$"))) |