Patch 8.2.3075

4 views
Skip to first unread message

Bram Moolenaar

unread,
Jun 30, 2021, 6:05:26 AM6/30/21
to vim...@googlegroups.com

Patch 8.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)
Files: src/xxd/xxd.c, src/testdir/test_xxd.vim


*** ../vim-8.2.3074/src/xxd/xxd.c 2020-05-30 20:50:21.900629437 +0200
--- src/xxd/xxd.c 2021-06-29 20:33:23.514211641 +0200
***************
*** 55,70 ****
* 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 (jnwe...@informatik.uni-erlangen.de)
*
* 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.
*/

/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */
--- 55,66 ----
* 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 (jnwe...@gmail.com)
*
* I hereby grant permission to distribute and use xxd
* under X11-MIT or GPL-2.0 (at the user's choice).
*
! * Contributions by Bram Moolenaar et al.
*/

/* Visual Studio 2005 has 'deprecated' many of the standard CRT functions */
***************
*** 135,141 ****
extern long int strtol();
extern long int ftell();

! char version[] = "xxd V1.10 27oct98 by Juergen Weigert";
#ifdef WIN32
char osver[] = " (Win32)";
#else
--- 131,137 ----
extern long int strtol();
extern long int ftell();

! char version[] = "xxd 2020-02-04 by Juergen Weigert et al.";
#ifdef WIN32
char osver[] = " (Win32)";
#else
*** ../vim-8.2.3074/src/testdir/test_xxd.vim 2020-08-12 18:50:31.891655745 +0200
--- src/testdir/test_xxd.vim 2021-06-29 20:34:56.870005518 +0200
***************
*** 226,232 ****
func Test_xxd_version()
new
exe 'r! ' . s:xxd_cmd . ' -v'
! call assert_match("xxd V1.10 .* by Juergen Weigert", join(getline(1, 3)))
bwipe!
endfunc

--- 226,232 ----
func Test_xxd_version()
new
exe 'r! ' . s:xxd_cmd . ' -v'
! call assert_match('xxd 20\d\d-\d\d-\d\d by Juergen Weigert et al\.', join(getline(1, 3)))
bwipe!
endfunc

*** ../vim-8.2.3074/src/version.c 2021-06-29 20:22:27.655393059 +0200
--- src/version.c 2021-06-29 20:35:18.013959684 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3075,
/**/

--
Never go to the toilet in a paperless office.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages