patch 8.2.3075: xxd always reports an old version string

Problem:    Xxd always reports an old version string. (Åsmund Ervik)
Solution:   Update the version string with the last known change date.
            (Jürgen Weigert, closes #8475)

diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index 4eef7a4e535ddac65e15c22e30339926aaa5c455..922c5ab3a69a8fa908876dc5a9614e7d95b6e49d 100644 (file)
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -226,7 +226,7 @@ endfunc
 func Test_xxd_version()
   new
   exe 'r! ' . s:xxd_cmd . ' -v'
-  call assert_match("xxd V1.10 .* by Juergen Weigert", join(getline(1, 3)))
+  call assert_match('xxd 20\d\d-\d\d-\d\d by Juergen Weigert et al\.', join(getline(1, 3)))
   bwipe!
 endfunc
 

diff --git a/src/version.c b/src/version.c
index f60abafe174a02a3f73e5656dd209920c47ef996..466cde1b13186edf2573eec2e2dacc510ee392e3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3075,
 /**/
     3074,
 /**/

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 20f06ab7c5c9fdb6b75de552c1a3ddcaea1f7d81..94cc220bfbbb9cfdf850f917a280fec56118d386 100644 (file)
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -55,16 +55,12 @@
  * 11.01.2019  Add full 64/32 bit range to -o and output by Christer Jensen.
  * 04.02.2020  Add -d for decimal offsets by Aapo Rantalainen
  *
- * (c) 1990-1998 by Juergen Weigert (jnweiger@informatik.uni-erlangen.de)
+ * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com)
  *
  * I hereby grant permission to distribute and use xxd
  * under X11-MIT or GPL-2.0 (at the user's choice).
  *
- * Small changes made afterwards by Bram Moolenaar et al.
- *
- * Distribute freely and credit me,
- * make money and share with me,
- * lose money and don't ask me.
+ * Contributions by Bram Moolenaar et al.
  */
 
 /* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */
@@ -135,7 +131,7 @@ extern void perror __P((char *));
 extern long int strtol();
 extern long int ftell();
 
-char version[] = "xxd V1.10 27oct98 by Juergen Weigert";
+char version[] = "xxd 2020-02-04 by Juergen Weigert et al.";
 #ifdef WIN32
 char osver[] = " (Win32)";
 #else