[vim] drop xxd-locale patch update to patchlevel 206
Karsten Hopp
karsten at fedoraproject.org
Mon May 30 12:03:14 UTC 2011
commit 03f22da79aeccae6a3e87948969393704c9d9e3f
Author: Karsten Hopp <karsten at redhat.com>
Date: Mon May 30 14:00:30 2011 +0200
drop xxd-locale patch
update to patchlevel 206
7.3.202 | 42 ------------------------------------------
7.3.203 | 50 +-------------------------------------------------
vim.spec | 7 ++++---
3 files changed, 5 insertions(+), 94 deletions(-)
---
diff --git a/7.3.202 b/7.3.202
index be22ea6..087cb4b 100644
--- a/7.3.202
+++ b/7.3.202
@@ -153,16 +153,6 @@ Files: runtime/doc/indent.txt, src/misc1.c, src/testdir/test3.in,
statement after it in the same line.
***************
-*** 256,261 ****
---- 273,279 ----
- break; break;
- } }
- <
-+ *cino-b*
- bN If N != 0 Vim will align a final "break" with the case label,
- so that case..break looks like a sort of block. (default: 0).
- When using 1, consider adding "0=break" to 'cinkeys'.
-***************
*** 272,277 ****
--- 290,296 ----
break; break;
@@ -227,16 +217,6 @@ Files: runtime/doc/indent.txt, src/misc1.c, src/testdir/test3.in,
initializations, if they start in a new line (otherwise they
are aligned at the right side of the ':').
***************
-*** 320,325 ****
---- 357,363 ----
- BaseClass(3) BaseClass(3)
- {} {}
- <
-+ *cino-+*
- +N Indent a continuation line (a line that spills onto the next)
- inside a function N additional characters. (default
- 'shiftwidth').
-***************
*** 330,335 ****
--- 368,374 ----
a = b + 9 * a = b + 9 *
@@ -368,28 +348,6 @@ Files: runtime/doc/indent.txt, src/misc1.c, src/testdir/test3.in,
them with labels. The value 'N' is currently unused but must be
non-zero (e.g. 'J1'). >
***************
-*** 466,481 ****
---- 514,532 ----
- }
- }
- <
-+ *cino-)*
- )N Vim searches for unclosed parentheses at most N lines away.
- This limits the time needed to search for parentheses. (default
- 20 lines).
-
-+ *cino-star*
- *N Vim searches for unclosed comments at most N lines away. This
- limits the time needed to search for the start of a comment.
- If your /* */ comments stop indenting afer N lines this is the
- value you will want to change.
- (default 70 lines).
-
-+ *cino-#*
- #N When N is non-zero recognize shell/Perl comments, starting with
- '#'. Default N is zero: don't recognizes '#' comments. Note
- that lines starting with # will still be seen as preprocessor
-***************
*** 483,489 ****
diff --git a/7.3.203 b/7.3.203
index 4cbb475..a724cf7 100644
--- a/7.3.203
+++ b/7.3.203
@@ -10,57 +10,9 @@ Content-Transfer-Encoding: 8bit
Patch 7.3.203
Problem: MS-Windows: Can't run an external command without a console window.
Solution: Support ":!start /b cmd". (Xaizek)
-Files: runtime/doc/os_win32.txt, src/os_win32.c
+Files: src/os_win32.c
-*** ../mercurial/vim73/runtime/doc/os_win32.txt 2011-01-08 16:05:50.000000000 +0100
---- runtime/doc/os_win32.txt 2011-05-25 17:04:58.000000000 +0200
-***************
-*** 313,319 ****
- with :!start do not get passed Vim's open file handles, which means they do
- not have to be closed before Vim.
- To avoid this special treatment, use ":! start".
-! The optional "/min" argument causes the window to be minimized.
-
- Q. I'm using Win32s, and when I try to run an external command like "make",
- Vim doesn't wait for it to finish! Help!
---- 313,348 ----
- with :!start do not get passed Vim's open file handles, which means they do
- not have to be closed before Vim.
- To avoid this special treatment, use ":! start".
-! There are two optional arguments (see the next Q):
-! /min the window will be minimized.
-! /b" no console window will be opened
-! You can only one of these flags at a time. A second second one will be
-! treated as the start of the command.
-!
-! Q. How do I avoid getting a window for programs that I run asynchronously?
-! A. You have two possible solutions depending on what exactly do you want:
-! 1) You may use the /min flag that would run program in minimized state with
-! no other changes. It will work equally for console and GUI applications.
-! 2) You can use /b flag to run console applications without creating a
-! console window for them (GUI applications are not affected). But you
-! should use this flag only if application you run doesn't require any
-! input. Otherwise it will get an EOF error because it's input stream
-! (stdin) would be redirected to \\.\NUL (stdour and stderr too).
-!
-! Example for a console application, run Exuberant ctags: >
-! :!start /min ctags -R .
-! < When it has finished you should see file named "tags" in your current
-! directory. You should notice the window title blinking on your taskbar.
-! This is more noticable for commands that take longer.
-! Now delete the "tags" file and run this command: >
-! :!start /b ctags -R .
-! < You should have the same "tags" file, but this time there will be no
-! blinking on the taskbar.
-! Example for a GUI application: >
-! :!start /min notepad
-! :!start /b notepad
-! < The first command runs notepad minimized and the second one runs it
-! normally.
-
- Q. I'm using Win32s, and when I try to run an external command like "make",
- Vim doesn't wait for it to finish! Help!
*** ../mercurial/vim73/src/os_win32.c 2011-05-05 18:31:54.000000000 +0200
--- src/os_win32.c 2011-05-25 16:45:31.000000000 +0200
***************
diff --git a/vim.spec b/vim.spec
index cf69db3..282bba6 100644
--- a/vim.spec
+++ b/vim.spec
@@ -56,7 +56,6 @@ Source23: ftp://ftp.vim.org/vol/2/vim/runtime/autoload/netrwSettings.vim
Patch2002: vim-7.0-fixkeys.patch
Patch2003: vim-6.2-specsyntax.patch
Patch2004: vim-7.0-crv.patch
-Patch2010: xxd-locale.patch
%if %{withhunspell}
Patch2011: vim-7.0-hunspell.patch
BuildRequires: hunspell-devel
@@ -265,7 +264,9 @@ Patch198: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.198
Patch199: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.199
Patch200: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.200
Patch201: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.201
+# Patched:
Patch202: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.202
+# Patched:
Patch203: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.203
Patch204: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.204
Patch205: ftp://ftp.vim.org/pub/vim/patches/7.3/7.3.205
@@ -406,7 +407,6 @@ chmod -x runtime/tools/mve.awk
%patch2002 -p1
%patch2003 -p1
%patch2004 -p1
-%patch2010 -p1
%if %{withhunspell}
%patch2011 -p1
%endif
@@ -1088,7 +1088,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon May 30 2011 Karsten Hopp <karsten at redhat.com> 7.3.206-1
-- patchlevel 206
+- drop xxd-locale patch
+- update to patchlevel 206
* Wed May 11 2011 Karsten Hopp <karsten at redhat.com> 7.3.189-1
- patchlevel 189
More information about the scm-commits
mailing list