Use Gnulib filevercmp for version comparison

* admin/merge-gnulib (GNULIB_MODULES): Add filevercmp.
* doc/lispref/strings.texi (Text Comparison):
* etc/NEWS, src/fns.c:
* test/src/fns-tests.el (fns-tests-string-version-lessp):
Rename newly-introduced function to string-version-lessp, by
analogy with strverscmp.
* lib/filevercmp.c, lib/filevercmp.h: New files, copied from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* src/fns.c: Include <filevercmp.h>.
(gather_number_from_string): Remove.
(Fstring_version_lessp): Reimplement via filevercmp.

1 files changed, 14 insertions, 14 deletions

diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index 0c6edb89252..861736995f4 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -192,19 +192,19 @@
                a b (if (eq system-type 'windows-nt) "enu_USA" "en_US.UTF-8")))))
     '("Adrian" "Ævar" "Agustín" "Eli"))))
 
-(ert-deftest fns-tests-string-numeric-lessp ()
-  (should (string-numeric-lessp "foo2.png" "foo12.png"))
-  (should (not (string-numeric-lessp "foo12.png" "foo2.png")))
-  (should (string-numeric-lessp "foo12.png" "foo20000.png"))
-  (should (not (string-numeric-lessp "foo20000.png" "foo12.png")))
-  (should (string-numeric-lessp "foo.png" "foo2.png"))
-  (should (not (string-numeric-lessp "foo2.png" "foo.png")))
+(ert-deftest fns-tests-string-version-lessp ()
+  (should (string-version-lessp "foo2.png" "foo12.png"))
+  (should (not (string-version-lessp "foo12.png" "foo2.png")))
+  (should (string-version-lessp "foo12.png" "foo20000.png"))
+  (should (not (string-version-lessp "foo20000.png" "foo12.png")))
+  (should (string-version-lessp "foo.png" "foo2.png"))
+  (should (not (string-version-lessp "foo2.png" "foo.png")))
   (should (equal (sort '("foo12.png" "foo2.png" "foo1.png")
-                       'string-numeric-lessp)
+                       'string-version-lessp)
                  '("foo1.png" "foo2.png" "foo12.png")))
-  (should (string-numeric-lessp "foo2" "foo1234"))
-  (should (not (string-numeric-lessp "foo1234" "foo2")))
-  (should (string-numeric-lessp "foo.png" "foo2"))
-  (should (string-numeric-lessp "foo1.25.5.png" "foo1.125.5"))
-  (should (string-numeric-lessp "2" "1245"))
-  (should (not (string-numeric-lessp "1245" "2"))))
+  (should (string-version-lessp "foo2" "foo1234"))
+  (should (not (string-version-lessp "foo1234" "foo2")))
+  (should (string-version-lessp "foo.png" "foo2"))
+  (should (string-version-lessp "foo1.25.5.png" "foo1.125.5"))
+  (should (string-version-lessp "2" "1245"))
+  (should (not (string-version-lessp "1245" "2"))))