To: vim_dev@googlegroups.com Subject: Patch 8.2.3523 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3523 Problem: Duplicated code in xxd. Solution: Remove duplicated lines. (closes #8972) Files: src/xxd/xxd.c *** ../vim-8.2.3522/src/xxd/xxd.c 2021-06-29 19:36:17.257832714 +0100 --- src/xxd/xxd.c 2021-10-16 19:07:31.115769417 +0100 *************** *** 346,361 **** n1 = -1; if ((++p >= cols) && !hextype) { ! /* skip rest of line as garbage */ ! want_off = 0; ! while ((c = getc(fpi)) != '\n' && c != EOF) ! ; ! if (c == EOF && ferror(fpi)) ! die(2); ! ign_garb = 1; } } ! else if (n1 < 0 && n2 < 0 && n3 < 0) { /* already stumbled into garbage, skip line, wait and see */ if (!hextype) --- 346,357 ---- n1 = -1; if ((++p >= cols) && !hextype) { ! /* skip the rest of the line as garbage */ ! n2 = -1; ! n3 = -1; } } ! if (n1 < 0 && n2 < 0 && n3 < 0) { /* already stumbled into garbage, skip line, wait and see */ if (!hextype) *** ../vim-8.2.3522/src/version.c 2021-10-16 17:51:08.047842118 +0100 --- src/version.c 2021-10-16 19:04:46.878133332 +0100 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 3523, /**/ -- hundred-and-one symptoms of being an internet addict: 170. You introduce your wife as "my_lady@home.wife" and refer to your children as "forked processes." /// Bram Moolenaar -- Bram@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 ///