r472 - trunk/vim/patches
Pierre Habouzit
madcoder at costa.debian.org
Thu Jan 19 12:44:07 UTC 2006
Author: madcoder
Date: 2006-01-19 12:44:02 +0000 (Thu, 19 Jan 2006)
New Revision: 472
Modified:
trunk/vim/patches/102_filetype.vim.diff
trunk/vim/patches/103_sh.vim.diff
trunk/vim/patches/105_recognize-gnumakefile-am.diff
trunk/vim/patches/129_filetype.vim.diff
trunk/vim/patches/133_filetype.vim.diff
trunk/vim/patches/135_debsources.vim.diff
trunk/vim/patches/137_filetype.vim.diff
trunk/vim/patches/141_asterisk.vim.diff
trunk/vim/patches/302_message.c.diff
Log:
update patches to avoid fuzzyness
Modified: trunk/vim/patches/102_filetype.vim.diff
===================================================================
--- trunk/vim/patches/102_filetype.vim.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/102_filetype.vim.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,6 +1,7 @@
-diff -Nrua vim63.orig/runtime/filetype.vim vim63/runtime/filetype.vim
---- vim~/vim/runtime/filetype.vim 2005-03-15 10:18:48.000000000 +0100
-+++ vim/vim/runtime/filetype.vim 2005-03-16 08:47:24.150310908 +0100
+Index: vim/vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/vim/runtime/filetype.vim 2006-01-19 13:36:40.000000000 +0100
++++ vim/vim/runtime/filetype.vim 2006-01-19 13:36:44.000000000 +0100
@@ -302,7 +302,7 @@
au BufNewFile,BufRead *.con setf cterm
Modified: trunk/vim/patches/103_sh.vim.diff
===================================================================
--- trunk/vim/patches/103_sh.vim.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/103_sh.vim.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,12 +1,13 @@
-diff -Nur vim63.orig/runtime/syntax/sh.vim vim63/runtime/syntax/sh.vim
---- vim~/vim/runtime/syntax/sh.vim 2004-05-16 13:20:29.000000000 +0000
-+++ vim/vim/runtime/syntax/sh.vim 2004-11-12 18:54:48.000000000 +0000
-@@ -217,7 +217,7 @@
- " Comments
- "=========
+Index: vim/vim/runtime/syntax/sh.vim
+===================================================================
+--- vim.orig/vim/runtime/syntax/sh.vim 2006-01-19 13:36:47.000000000 +0100
++++ vim/vim/runtime/syntax/sh.vim 2006-01-19 13:36:53.000000000 +0100
+@@ -243,7 +243,7 @@
+ " Comments: {{{1
+ "==========
syn cluster shCommentGroup contains=shTodo, at Spell
-syn keyword shTodo contained TODO
+syn keyword shTodo contained TODO FIXME XXX
syn match shComment "#.*$" contains=@shCommentGroup
- " File redirection highlighted as operators
+ " File Redirection Highlighted As Operators: {{{1
Modified: trunk/vim/patches/105_recognize-gnumakefile-am.diff
===================================================================
--- trunk/vim/patches/105_recognize-gnumakefile-am.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/105_recognize-gnumakefile-am.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,6 +1,8 @@
---- vim~/vim/runtime/filetype.vim~ 2004-10-20 19:37:19.000000000 -0700
-+++ vim/vim/runtime/filetype.vim 2004-10-20 19:37:53.000000000 -0700
-@@ -177,7 +177,7 @@
+Index: vim/vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/vim/runtime/filetype.vim 2006-01-19 13:36:44.000000000 +0100
++++ vim/vim/runtime/filetype.vim 2006-01-19 13:37:02.000000000 +0100
+@@ -180,7 +180,7 @@
au BufNewFile,BufRead *.atl,*.as setf atlas
" Automake
Modified: trunk/vim/patches/129_filetype.vim.diff
===================================================================
--- trunk/vim/patches/129_filetype.vim.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/129_filetype.vim.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,7 +1,8 @@
-diff -ur vim63.orig/runtime/filetype.vim vim63/runtime/filetype.vim
---- vim~/vim/runtime/filetype.vim 2005-06-16 00:17:26.000000000 -0400
-+++ vim/vim/runtime/filetype.vim 2005-06-16 00:19:40.000000000 -0400
-@@ -956,6 +956,7 @@
+Index: vim/vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/vim/runtime/filetype.vim 2006-01-19 13:37:02.000000000 +0100
++++ vim/vim/runtime/filetype.vim 2006-01-19 13:37:47.000000000 +0100
+@@ -974,6 +974,7 @@
else
au BufNewFile,BufRead *.pl call FTCheck_pl()
endif
Modified: trunk/vim/patches/133_filetype.vim.diff
===================================================================
--- trunk/vim/patches/133_filetype.vim.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/133_filetype.vim.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,7 +1,8 @@
-diff -urN vim63/runtime/filetype.vim vim63.new/runtime/filetype.vim
---- vim~/vim/runtime/filetype.vim 2005-08-12 11:32:00.000000000 +0200
-+++ vim/vim/runtime/filetype.vim 2005-08-12 11:31:38.000000000 +0200
-@@ -376,7 +376,14 @@
+Index: vim/vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/vim/runtime/filetype.vim 2006-01-19 13:37:58.000000000 +0100
++++ vim/vim/runtime/filetype.vim 2006-01-19 13:38:01.000000000 +0100
+@@ -379,7 +379,14 @@
\ endif
" Cobol
@@ -17,7 +18,7 @@
" Cold Fusion
au BufNewFile,BufRead *.cfm,*.cfi,*.cfc setf cf
-@@ -1615,6 +1622,13 @@
+@@ -1645,6 +1652,13 @@
" Yaml
au BufNewFile,BufRead *.yaml,*.yml setf yaml
Modified: trunk/vim/patches/135_debsources.vim.diff
===================================================================
--- trunk/vim/patches/135_debsources.vim.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/135_debsources.vim.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,7 +1,8 @@
-diff -ruN vim63.orig/runtime/filetype.vim vim63/runtime/filetype.vim
---- vim~/vim/runtime/filetype.vim 2005-08-17 12:53:12.067644832 +0200
-+++ vim/vim/runtime/filetype.vim 2005-08-17 12:55:28.072968880 +0200
-@@ -1437,6 +1437,9 @@
+Index: vim/vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/vim/runtime/filetype.vim 2006-01-19 13:38:01.000000000 +0100
++++ vim/vim/runtime/filetype.vim 2006-01-19 13:38:08.000000000 +0100
+@@ -1465,6 +1465,9 @@
" OpenSSH server configuration
au BufNewFile,BufRead sshd_config setf sshdconfig
Modified: trunk/vim/patches/137_filetype.vim.diff
===================================================================
--- trunk/vim/patches/137_filetype.vim.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/137_filetype.vim.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,7 +1,8 @@
-diff -urN vim63/runtime/filetype.vim vim63.new/runtime/filetype.vim
---- vim~/vim/runtime/filetype.vim 2005-08-19 09:10:10.000000000 -0400
-+++ vim/vim/runtime/filetype.vim 2005-08-19 09:18:22.000000000 -0400
-@@ -758,7 +758,7 @@
+Index: vim/vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/vim/runtime/filetype.vim 2006-01-19 13:38:08.000000000 +0100
++++ vim/vim/runtime/filetype.vim 2006-01-19 13:38:12.000000000 +0100
+@@ -769,7 +769,7 @@
au BufNewFile,BufRead *.mgp setf mgp
" Mail (for Elm, trn, mutt, rn, slrn)
@@ -10,7 +11,7 @@
" Mailcap configuration file
au BufNewFile,BufRead .mailcap,mailcap setf mailcap
-@@ -876,7 +876,7 @@
+@@ -891,7 +891,7 @@
au BufNewFile,BufRead *.mush setf mush
" Mutt setup file
@@ -19,7 +20,7 @@
" Nastran input/DMAP
"au BufNewFile,BufRead *.dat setf nastran
-@@ -1698,7 +1698,7 @@
+@@ -1728,7 +1728,7 @@
au BufNewFile,BufRead [rR]akefile* setf ruby
" Mutt setup file
Modified: trunk/vim/patches/141_asterisk.vim.diff
===================================================================
--- trunk/vim/patches/141_asterisk.vim.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/141_asterisk.vim.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,9 +1,10 @@
-diff -urN vim63/runtime/filetype.vim vim63.new/runtime/filetype.vim
---- vim~/vim/runtime/filetype.vim 2005-09-19 21:52:16.000000000 +0200
-+++ vim/vim/runtime/filetype.vim 2005-09-19 21:51:43.000000000 +0200
-@@ -1722,6 +1722,9 @@
- au BufNewFile,BufRead svn-commit.*.tmp setf svn
- au BufNewFile,BufRead svn-commit.tmp setf svn
+Index: vim/vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/vim/runtime/filetype.vim 2006-01-19 13:38:12.000000000 +0100
++++ vim/vim/runtime/filetype.vim 2006-01-19 13:38:19.000000000 +0100
+@@ -1745,6 +1745,9 @@
+ " Subversion commit file
+ au BufNewFile,BufRead svn-commit*.tmp setf svn
+" Asterisk config file
+au BufNewFile,BufRead *asterisk/*.conf* setf asterisk
@@ -11,7 +12,7 @@
" X resources file
au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* setf xdefaults
-@@ -1740,7 +1743,6 @@
+@@ -1763,7 +1766,6 @@
" Z-Shell script
au BufNewFile,BufRead zsh*,zlog* setf zsh
@@ -19,9 +20,10 @@
" Generic configuration file (check this last, it's just guessing!)
au BufNewFile,BufRead,StdinReadPost *
\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
-diff -urN vim63/runtime/syntax/asterisk.vim vim63.new/runtime/syntax/asterisk.vim
---- vim~/vim/runtime/syntax/asterisk.vim 1970-01-01 01:00:00.000000000 +0100
-+++ vim/vim/runtime/syntax/asterisk.vim 2005-09-19 21:51:03.000000000 +0200
+Index: vim/vim/runtime/syntax/asterisk.vim
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vim/vim/runtime/syntax/asterisk.vim 2006-01-19 13:38:19.000000000 +0100
@@ -0,0 +1,73 @@
+" Vim syntax file
+" Language: Asterisk config file
Modified: trunk/vim/patches/302_message.c.diff
===================================================================
--- trunk/vim/patches/302_message.c.diff 2006-01-18 10:45:43 UTC (rev 471)
+++ trunk/vim/patches/302_message.c.diff 2006-01-19 12:44:02 UTC (rev 472)
@@ -1,7 +1,8 @@
-diff -Nur vim63.orig/src/message.c vim63/src/message.c
---- vim~/vim/src/message.c 2005-03-26 12:33:36.747667152 +0100
-+++ vim/vim/src/message.c 2005-03-26 12:34:52.374170176 +0100
-@@ -905,7 +905,7 @@
+Index: vim/vim/src/message.c
+===================================================================
+--- vim.orig/vim/src/message.c 2006-01-19 13:34:37.000000000 +0100
++++ vim/vim/src/message.c 2006-01-19 13:34:38.000000000 +0100
+@@ -909,7 +909,7 @@
* CTRL-C, but we need to loop then. */
had_got_int = got_int;
c = safe_vgetc();
More information about the pkg-vim-maintainers
mailing list