r182 - in trunk/vim/debian: . patches

[Stefano Zacchiroli]

Author: zack
Date: 2005-04-23 21:38:56 +0000 (Sat, 23 Apr 2005)
New Revision: 182

Added:
   trunk/vim/debian/patches/122_html_indent.vim.diff
Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/patches/118_ocaml.vim.diff
Log:
- added patch which removes <BS> from html indentkeys
- patched ocaml efm to follows make directory changes


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-04-19 21:18:44 UTC (rev 181)
+++ trunk/vim/debian/changelog	2005-04-23 21:38:56 UTC (rev 182)
@@ -13,7 +13,9 @@
     + Added /usr/share/common-licenses/ reference to debian/copyright.
     + Remove debian/helpztags.1 on debian/rules clean (generated file)
     + Updated patch 118_ocaml.vim.diff (new upstream).
-    + Added patch 401_doc_exrc.diff, which fixes starting doc wrt "_exrc".
+    + Added patch 122_html_indent.vim.diff, remove <bs> from indentkeys for
+      html. (closes: #280386)
+    + Added patch 401_doc_exrc.diff, fixes starting doc about "_exrc".
       (closes: #279378)
 
   * Matthijs Mohlmann <matthijs@cacholong.nl>:

Modified: trunk/vim/debian/patches/118_ocaml.vim.diff
===================================================================
--- trunk/vim/debian/patches/118_ocaml.vim.diff	2005-04-19 21:18:44 UTC (rev 181)
+++ trunk/vim/debian/patches/118_ocaml.vim.diff	2005-04-23 21:38:56 UTC (rev 182)
@@ -1,7 +1,7 @@
 diff -urN vim63/runtime/ftplugin/ocaml.vim vim63.new/runtime/ftplugin/ocaml.vim
 --- vim63/runtime/ftplugin/ocaml.vim	2003-05-11 21:09:36.000000000 +0200
-+++ vim63.new/runtime/ftplugin/ocaml.vim	2005-04-12 00:09:16.000000000 +0200
-@@ -1,36 +1,59 @@
++++ vim63.new/runtime/ftplugin/ocaml.vim	2005-04-23 23:36:04.000000000 +0200
+@@ -1,36 +1,64 @@
 -" Vim settings file
 -" Language:     OCaml
 -" Maintainers:  Mike Leary    <leary@nwlink.com>
@@ -17,7 +17,7 @@
 +"              Markus Mottl        <markus.mottl@gmail.com>
 +"              Stefano Zacchiroli  <zack@bononia.it>
 +" URL:         http://www.ocaml.info/vim/ftplugin/ocaml.vim
-+" Last Change: 2005 March 25
++" Last Change: 2005 March 25 + debian patch for efm (see below)
 +" Changelog:
 +"         0.12 - Modeline support
 +"              - Folding now works also when indent_struct != 2
@@ -78,7 +78,12 @@
 +      \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
 +      \%Wocamlyacc:\ w\ -\ %m,
 +      \%-Zmake%.%#,
-+      \%C%m
++      \%C%m,
++      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
++      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
++      \%DMaking\ %*\\a\ in\ %f
++" Last 3 lines added by Zack to the debian vim package, enable vim to follows
++" directory changes perfomed by make. Not yet integrated upstream.
  
  " Add mappings, unless the user didn't want this.
  if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
@@ -87,7 +92,7 @@
    if !hasmapto('<Plug>Comment')
      nmap <buffer> <LocalLeader>c <Plug>LUncomOn
      vmap <buffer> <LocalLeader>c <Plug>BUncomOn
-@@ -47,3 +70,338 @@
+@@ -47,3 +75,338 @@
      iabbrev <buffer> ASS (assert false)
    endif
  endif
@@ -428,7 +433,7 @@
 +vmap <LocalLeader>t :call OCamlPrintType("visual")<RETURN>
 diff -urN vim63/runtime/indent/ocaml.vim vim63.new/runtime/indent/ocaml.vim
 --- vim63/runtime/indent/ocaml.vim	2003-04-14 21:03:07.000000000 +0200
-+++ vim63.new/runtime/indent/ocaml.vim	2005-04-12 00:09:37.000000000 +0200
++++ vim63.new/runtime/indent/ocaml.vim	2005-04-23 23:32:56.000000000 +0200
 @@ -1,12 +1,12 @@
  " Vim indent file
 -" Language:	OCaml
@@ -710,7 +715,7 @@
  
 diff -urN vim63/runtime/syntax/ocaml.vim vim63.new/runtime/syntax/ocaml.vim
 --- vim63/runtime/syntax/ocaml.vim	2003-05-04 23:12:48.000000000 +0200
-+++ vim63.new/runtime/syntax/ocaml.vim	2005-04-12 00:10:02.000000000 +0200
++++ vim63.new/runtime/syntax/ocaml.vim	2005-04-23 23:32:56.000000000 +0200
 @@ -1,19 +1,23 @@
  " Vim syntax file
  " Language:     OCaml

Added: trunk/vim/debian/patches/122_html_indent.vim.diff
===================================================================
--- trunk/vim/debian/patches/122_html_indent.vim.diff	2005-04-19 21:18:44 UTC (rev 181)
+++ trunk/vim/debian/patches/122_html_indent.vim.diff	2005-04-23 21:38:56 UTC (rev 182)
@@ -0,0 +1,12 @@
+diff -urN vim63/runtime/indent/html.vim vim63.new/runtime/indent/html.vim
+--- vim63/runtime/indent/html.vim	2004-05-16 15:36:25.000000000 +0200
++++ vim63.new/runtime/indent/html.vim	2005-04-23 23:25:39.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ " [-- local settings (must come before aborting the script) --]
+ setlocal indentexpr=HtmlIndentGet(v:lnum)
+-setlocal indentkeys=o,O,*<Return>,<>>,<bs>,{,}
++setlocal indentkeys=o,O,*<Return>,<>>,{,}
+ 
+ 
+ if exists('g:html_indent_tags')