aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.1861: xxd: issue when -R is specified several times

Browse Source 
Problem:  xxd: issue when -R is specified several times
Solution: Fix command line parsing

See: https://github.com/vim/vim/pull/12986#issuecomment-1704375892

closes: #13021

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: K.Takata <kentkt@csc.jp>
Co-authored-by: Aapo Rantalainen <aapo.rantalainen@gmail.com>
This commit is contained in:
K.Takata
2023-09-04 07:46:59 +02:00
committed by Christian Brabandt
parent f44cbe96fa
commit 233f956bd4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -699,6 +699,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 */
/**/
1861,
/**/ /**/
1860, 1860,
/**/ /**/

4
src/xxd/xxd.c
View File

@@ -135,7 +135,7 @@ extern void perror __P((char *));
# endif # endif
#endif #endif
char version[] = "xxd 2023-09-01 by Juergen Weigert et al."; char version[] = "xxd 2023-09-04 by Juergen Weigert et al.";
#ifdef WIN32 #ifdef WIN32
char osver[] = " (Win32)"; char osver[] = " (Win32)";
#else #else
@@ -759,7 +759,7 @@ main(int argc, char *argv[])
else if (!STRNCMP(pw, "never", 5)) else if (!STRNCMP(pw, "never", 5))
color = 0; color = 0;
else if (!STRNCMP(pw, "auto", 4)) else if (!STRNCMP(pw, "auto", 4))
; /* Do nothing. */ color = enable_color();
else else
exit_with_usage(); exit_with_usage();
} }