diff options
| author | =?UTF-8?q?J=C3=BCrgen=20Weigert?= <jnweiger@gmail.com> | 2021-06-29 20:36:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-29 20:36:25 +0200 |
| commit | 80b2ba3e9602e09ab523e78946fbb26da311b68b (patch) | |
| tree | f125ff3eab672fccc73ab831745768c3d361d421 /src | |
| parent | ea042677ab5cab736540f3164909cac2c685de74 (diff) | |
patch 8.2.3075: xxd always reports an old version stringv8.2.3075
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_xxd.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim index 4eef7a4e53..922c5ab3a6 100644 --- 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 f60abafe17..466cde1b13 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3075, +/**/ 3074, /**/ 3073, diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index 20f06ab7c5..94cc220bfb 100644 --- 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 |