aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

patch 8.2.3075: xxd always reports an old version string

Browse Source 
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)
This commit is contained in:
=?UTF-8?q?J=C3=BCrgen=20Weigert?=
2021-06-29 20:36:25 +02:00
committed by Bram Moolenaar
parent ea042677ab
commit 80b2ba3e96
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/test_xxd.vim
View File

@@ -226,7 +226,7 @@ endfunc
func Test_xxd_version() func Test_xxd_version()
new new
exe 'r! ' . s:xxd_cmd . ' -v' 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! bwipe!
endfunc endfunc

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3075,
/**/ /**/
3074, 3074,
/**/ /**/

10
src/xxd/xxd.c
View File

@@ -55,16 +55,12 @@
* 11.01.2019 Add full 64/32 bit range to -o and output by Christer Jensen. * 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 * 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 * I hereby grant permission to distribute and use xxd
* under X11-MIT or GPL-2.0 (at the user's choice). * under X11-MIT or GPL-2.0 (at the user's choice).
* *
* Small changes made afterwards by Bram Moolenaar et al. * Contributions by Bram Moolenaar et al.
*
* Distribute freely and credit me,
* make money and share with me,
* lose money and don't ask me.
*/ */
/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */ /* 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 strtol();
extern long int ftell(); 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 #ifdef WIN32
char osver[] = " (Win32)"; char osver[] = " (Win32)";
#else #else