- patchlevel 367
This commit is contained in:
Karsten Hopp
parent
38fd385a1a
commit
07a4c1af91
77
7.2.367
Normal file
77
7.2.367
Normal file
@ -0,0 +1,77 @@
|
||||
To: vim-dev@vim.org
|
||||
Subject: Patch 7.2.367
|
||||
Fcc: outbox
|
||||
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||
Mime-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
------------
|
||||
|
||||
Patch 7.2.367
|
||||
Problem: "xxd -r -p" doesn't work as documented.
|
||||
Solution: Skip white space. (James Vega)
|
||||
Files: src/xxd/xxd.c
|
||||
|
||||
|
||||
*** ../vim-7.2.366/src/xxd/xxd.c 2009-06-16 18:29:37.000000000 +0200
|
||||
--- src/xxd/xxd.c 2010-02-17 18:25:11.000000000 +0100
|
||||
***************
|
||||
*** 231,237 ****
|
||||
fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname);
|
||||
fprintf(stderr, "Options:\n");
|
||||
fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n");
|
||||
! fprintf(stderr, " -b binary digit dump (incompatible with -p,-i,-r). Default hex.\n");
|
||||
fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n");
|
||||
fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n");
|
||||
fprintf(stderr, " -g number of octets per group in normal output. Default 2.\n");
|
||||
--- 231,237 ----
|
||||
fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname);
|
||||
fprintf(stderr, "Options:\n");
|
||||
fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n");
|
||||
! fprintf(stderr, " -b binary digit dump (incompatible with -ps,-i,-r). Default hex.\n");
|
||||
fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n");
|
||||
fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n");
|
||||
fprintf(stderr, " -g number of octets per group in normal output. Default 2.\n");
|
||||
***************
|
||||
*** 276,286 ****
|
||||
if (c == '\r') /* Doze style input file? */
|
||||
continue;
|
||||
|
||||
! #if 0 /* this doesn't work when there is normal text after the hex codes in
|
||||
! the last line that looks like hex */
|
||||
! if (c == ' ' || c == '\n' || c == '\t') /* allow multiple spaces */
|
||||
continue;
|
||||
- #endif
|
||||
|
||||
n3 = n2;
|
||||
n2 = n1;
|
||||
--- 276,286 ----
|
||||
if (c == '\r') /* Doze style input file? */
|
||||
continue;
|
||||
|
||||
! /* Allow multiple spaces. This doesn't work when there is normal text
|
||||
! * after the hex codes in the last line that looks like hex, thus only
|
||||
! * use it for PostScript format. */
|
||||
! if (hextype == HEX_POSTSCRIPT && (c == ' ' || c == '\n' || c == '\t'))
|
||||
continue;
|
||||
|
||||
n3 = n2;
|
||||
n2 = n1;
|
||||
*** ../vim-7.2.366/src/version.c 2010-02-17 18:20:23.000000000 +0100
|
||||
--- src/version.c 2010-02-17 18:26:35.000000000 +0100
|
||||
***************
|
||||
*** 683,684 ****
|
||||
--- 683,686 ----
|
||||
{ /* Add new patch number below this line */
|
||||
+ /**/
|
||||
+ 367,
|
||||
/**/
|
||||
|
||||
--
|
||||
hundred-and-one symptoms of being an internet addict:
|
||||
248. You sign your letters with your e-mail address instead of your name.
|
||||
|
||||
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
||||
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
||||
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
||||
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
||||
@ -396,3 +396,5 @@ Individual patches for Vim 7.2:
|
||||
2521 7.2.363 Perl 5.10 dynamic loading doesn't work
|
||||
2958 7.2.364 (extra) can't build gvimext.dll on Win 7 x64 using MinGW
|
||||
2390 7.2.365 (extra) MS-Windows with MingW: "File->Save As" does not work
|
||||
3802 7.2.366 CTRL-B doesn't go back to the first line of the buffer
|
||||
3236 7.2.367 "xxd -r -p" doesn't work as documented
|
||||
|
||||
9
vim.spec
9
vim.spec
@ -18,7 +18,7 @@
|
||||
#used for pre-releases:
|
||||
%define beta %{nil}
|
||||
%define vimdir vim72%{?beta}
|
||||
%define patchlevel 365
|
||||
%define patchlevel 367
|
||||
|
||||
Summary: The VIM editor
|
||||
URL: http://www.vim.org/
|
||||
@ -431,6 +431,8 @@ Patch362: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.362
|
||||
Patch363: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.363
|
||||
Patch364: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.364
|
||||
Patch365: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.365
|
||||
Patch366: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.366
|
||||
Patch367: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.367
|
||||
|
||||
Patch3000: vim-7.0-syntax.patch
|
||||
Patch3002: vim-7.1-nowarnings.patch
|
||||
@ -934,6 +936,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
||||
%patch363 -p0
|
||||
%patch364 -p0
|
||||
%patch365 -p0
|
||||
%patch366 -p0
|
||||
%patch367 -p0
|
||||
|
||||
|
||||
# install spell files
|
||||
@ -1398,6 +1402,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
|
||||
%changelog
|
||||
* Thu Feb 18 2010 Karsten Hopp <karsten@redhat.com> 7.2.367-1
|
||||
- patchlevel 367
|
||||
|
||||
* Wed Feb 17 2010 Karsten Hopp <karsten@redhat.com> 7.2.365-1
|
||||
- patchlevel 365
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user