projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8587d00a AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.367 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.367 | |
| 11 | Problem: "xxd -r -p" doesn't work as documented. | |
| 12 | Solution: Skip white space. (James Vega) | |
| 13 | Files: src/xxd/xxd.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.366/src/xxd/xxd.c 2009-06-16 18:29:37.000000000 +0200 | |
| 17 | --- src/xxd/xxd.c 2010-02-17 18:25:11.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 231,237 **** | |
| 20 | fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname); | |
| 21 | fprintf(stderr, "Options:\n"); | |
| 22 | fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n"); | |
| 23 | ! fprintf(stderr, " -b binary digit dump (incompatible with -p,-i,-r). Default hex.\n"); | |
| 24 | fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n"); | |
| 25 | fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n"); | |
| 26 | fprintf(stderr, " -g number of octets per group in normal output. Default 2.\n"); | |
| 27 | --- 231,237 ---- | |
| 28 | fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname); | |
| 29 | fprintf(stderr, "Options:\n"); | |
| 30 | fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n"); | |
| 31 | ! fprintf(stderr, " -b binary digit dump (incompatible with -ps,-i,-r). Default hex.\n"); | |
| 32 | fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n"); | |
| 33 | fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n"); | |
| 34 | fprintf(stderr, " -g number of octets per group in normal output. Default 2.\n"); | |
| 35 | *************** | |
| 36 | *** 276,286 **** | |
| 37 | if (c == '\r') /* Doze style input file? */ | |
| 38 | continue; | |
| 39 | ||
| 40 | ! #if 0 /* this doesn't work when there is normal text after the hex codes in | |
| 41 | ! the last line that looks like hex */ | |
| 42 | ! if (c == ' ' || c == '\n' || c == '\t') /* allow multiple spaces */ | |
| 43 | continue; | |
| 44 | - #endif | |
| 45 | ||
| 46 | n3 = n2; | |
| 47 | n2 = n1; | |
| 48 | --- 276,286 ---- | |
| 49 | if (c == '\r') /* Doze style input file? */ | |
| 50 | continue; | |
| 51 | ||
| 52 | ! /* Allow multiple spaces. This doesn't work when there is normal text | |
| 53 | ! * after the hex codes in the last line that looks like hex, thus only | |
| 54 | ! * use it for PostScript format. */ | |
| 55 | ! if (hextype == HEX_POSTSCRIPT && (c == ' ' || c == '\n' || c == '\t')) | |
| 56 | continue; | |
| 57 | ||
| 58 | n3 = n2; | |
| 59 | n2 = n1; | |
| 60 | *** ../vim-7.2.366/src/version.c 2010-02-17 18:20:23.000000000 +0100 | |
| 61 | --- src/version.c 2010-02-17 18:26:35.000000000 +0100 | |
| 62 | *************** | |
| 63 | *** 683,684 **** | |
| 64 | --- 683,686 ---- | |
| 65 | { /* Add new patch number below this line */ | |
| 66 | + /**/ | |
| 67 | + 367, | |
| 68 | /**/ | |
| 69 | ||
| 70 | -- | |
| 71 | hundred-and-one symptoms of being an internet addict: | |
| 72 | 248. You sign your letters with your e-mail address instead of your name. | |
| 73 | ||
| 74 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 75 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 76 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 77 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |