[SCM] vim-scripts packaging branch, master, updated. 94d6931b39bc216e79e1673187150bfec7383e86

James Vega jamessan at debian.org
Wed Sep 2 03:33:49 UTC 2009


The following commit has been merged in the master branch:
commit 7883ce947b9d97c1a6ae77904b46b635b6a6860a
Author: James Vega <jamessan at debian.org>
Date:   Tue Sep 1 20:06:12 2009 -0400

    Remove git-commit script.  Vim is shipped with more complete scripts. (Closes: #539380)

diff --git a/debian/changelog b/debian/changelog
index 780db4d..3bf9838 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ vim-scripts (20090211-2) UNRELEASED; urgency=low
 
   * debian/control: Change Vcs-* fields to point at git repo.
   * Switch from dpatch to quilt.
+  * Remove git-commit script.  Vim is shipped with more complete scripts.
+    (Closes: #539380)
 
  -- James Vega <jamessan at debian.org>  Mon, 31 Aug 2009 18:14:35 -0400
 
diff --git a/debian/patches/git-defaults.diff b/debian/patches/git-defaults.diff
deleted file mode 100644
index 8ee92b9..0000000
--- a/debian/patches/git-defaults.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-## git-defaults.diff by Stefano Zacchiroli <zack at debian.org>
-##
-## provide a default value for g:git_diff_spawn_mode
-
-Index: vim-scripts/ftplugin/git.vim
-===================================================================
---- vim-scripts.orig/ftplugin/git.vim
-+++ vim-scripts/ftplugin/git.vim
-@@ -32,6 +32,10 @@
- 
- let b:did_ftplugin = 1
- 
-+if !exists("g:git_diff_spawn_mode")
-+  let g:git_diff_spawn_mode = 2
-+endif
-+
- setlocal tw=74
- setlocal nowarn nowb
- 
diff --git a/debian/patches/series b/debian/patches/series
index cee770e..8cb86fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ disabledby-tetris.diff
 disabledby-color_sample_pack.diff
 disabledby-whatdomain.diff
 disabledby-xml.diff
-git-defaults.diff
 sokoboan_path.diff
 usagestring-dtd2vim.diff
 vimplate_debian-path.diff
diff --git a/debian/vim-scripts.status b/debian/vim-scripts.status
index cc91524..619d56c 100644
--- a/debian/vim-scripts.status
+++ b/debian/vim-scripts.status
@@ -300,17 +300,6 @@ license:     no license
 disabledby:  let loaded_DoxygenToolkit = 1
 version:     0.1.17
 
-script_name: ftplugin/git.vim
-addon:       git-commit
-description: see your commit diff with git
-script_url:  http://www.vim.org/scripts/script.php?script_id=1934
-author:      Pierre Habouzit
-author_url:  http://www.vim.org/account/profile.php?user_id=12628
-email:       madcoder at debian.org
-license:     license [2], see below
-extras:	     syntax/git.vim
-version:     0.2
-
 script_name: autoload/omni/cpp/complete.vim
 addon:       omnicppcomplete
 description: C++ omni completion with a ctags database
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
deleted file mode 100644
index 23ad0a0..0000000
--- a/ftplugin/git.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-"=============================================================================
-" Copyright:    Copyright © Pierre Habouzit
-"               Permission is hereby granted to use and distribute this code,
-"               with or without modifications, provided that this copyright
-"               notice is copied with it. Like anything else that's free,
-"               bufexplorer.vim is provided *as is* and comes with no
-"               warranty of any kind, either expressed or implied. In no
-"               event will the copyright holder be liable for any damages
-"               resulting from the use of this software.
-" Description:  git-commit(1) helper
-" Maintainer:   Pierre Habouzit <madcoder at debian.org>
-" Last Changed: Mon, 26 Nov 2007 10:06:15 +0100
-" Usage:        This file should live in your ftplugin directory.
-"
-"               The configurations variables are:
-"
-"                 g:git_diff_opts        - options to add to git diff,
-"                                          (default "-C -C")
-"                 g:git_diff_spawn_mode  - use auto-split on commit ?
-"                                          * 1 == hsplit
-"                                          * 2 == vsplit
-"                                          * none else (default)
-"
-"               The default keymaping is:
-"
-"                 <Leader>gd   - view the diff in a hsplit
-"                 <Leader>ghd  - view the diff in a hsplit
-"                 <Leader>gvd  - view the diff in a vsplit
-"========================================================================={{{=
-
-if exists("b:did_ftplugin") | finish | endif
-
-let b:did_ftplugin = 1
-
-setlocal tw=74
-setlocal nowarn nowb
-
-function! Git_diff_windows(vertsplit, auto, opts)
-    if a:vertsplit
-        rightbelow vnew
-    else
-        rightbelow new
-    endif
-    silent! setlocal ft=diff previewwindow bufhidden=delete nobackup noswf nobuflisted nowrap buftype=nofile
-    exe "normal :r!LANG=C git diff --stat -p --cached ".a:opts."\no\<esc>1GddO\<esc>"
-    setlocal nomodifiable
-    noremap <buffer> q :bw<cr>
-    if a:auto
-        redraw!
-        wincmd p
-        redraw!
-    endif
-endfunction
-
-noremap <buffer> <Leader>gd :call Git_diff_windows(0, 0)<cr>
-noremap <buffer> <Leader>ghd :call Git_diff_windows(0, 0)<cr>
-noremap <buffer> <Leader>gvd :call Git_diff_windows(1, 0)<cr>
-
-if !exists("g:git_diff_opts")
-    let g:git_diff_opts = "-C -C"
-endif
-if exists("g:git_diff_spawn_mode")
-    if g:git_diff_spawn_mode == 1
-        call Git_diff_windows(0, 1, g:git_diff_opts)
-    elseif g:git_diff_spawn_mode == 2
-        call Git_diff_windows(1, 1, g:git_diff_opts)
-    endif
-endif
-
-" }}}
diff --git a/html/ftplugin_git.vim.html b/html/ftplugin_git.vim.html
deleted file mode 100644
index 94430a4..0000000
--- a/html/ftplugin_git.vim.html
+++ /dev/null
@@ -1,281 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-  <link rel="Stylesheet" type="text/css" href="/css/style.css" >
-  <title>git-commit - see your commit diff with git : vim online</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <meta name="KEYWORDS" content="Vim, Vi IMproved, text editor, home, documentation, tips, scripts, news">
-  <link rel="shortcut icon" type="image/x-icon" href="/images/vim_shortcut.ico">
-</head>
-
-<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff"> 
-
-<!-- HEADER, SPONSOR IMAGE, VIM IMAGE AND BOOK AD -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0" bordercolor="red">
-  <tr>
-    <td colspan="4" class="lightbg"><img src="/images/spacer.gif" width="1" height="5" alt=""></td>
-  </tr>
-  <tr>
-  <td class="lightbg">&nbsp;&nbsp;&nbsp;</td>
-  <td class="lightbg" align="left"><a href="/sponsor/index.php"><img src="/images/sponsorvim.gif" alt="sponsor Vim development" border="0"></a></td>
-    <td class="lightbg" align="center"><a href="/index.php"><img src="/images/vim_header.gif" border="0" alt="Vim logo"></a></td>
-    <td class="lightbg" align="right"><a href="http://iccf-holland.org/click5.html"><img src="/images/buyhelplearn.gif" alt="Vim Book Ad" border="0"></a></td>
-  </tr>
-  <tr>
-    <td colspan="4" class="lightbg"><img src="/images/spacer.gif" width="1" height="5" alt=""></td>
-  </tr>
-  <tr>
-    <td colspan="4" class="darkbg"><img src="/images/spacer.gif" width="1" height="10" alt=""></td>
-  </tr>
-</table>
-<!-- THE PAGE BODY: BETWEEN HEADER AND FOOTER -->
-
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-  <col width="180">
-  <col width="1">
-
-  <tr valign="top">
-    <td class="sidebar">
-      <table width="180" cellpadding="4" cellspacing="0" border="0">
-        <tr valign="top">
-          <td class="sidebar">
-
-<!-- INCLUDE THE PAGE NAVIGATION -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0" bordercolor="red">
-    <tr>
-        <td><small>not logged in (<a href="/login.php">login</a>)</small></td>
-    </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="1"></td>
-    </tr>
-    <tr>
-        <td class="darkbg"><img src="/images/spacer.gif" alt='' border="0" height="3"></td>
-    </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="2"></td>
-    </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/index.php">Home</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/search.php">Search</a></td>
-        </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="7"></td>
-    </tr>
-    <tr>
-        <td class="checker"><img src="/images/spacer.gif" alt='' border="0" height="1"></td>
-    </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="7"></td>
-    </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/about.php">About Vim</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/community.php">Community</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/news/news.php">News</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/sponsor/index.php">Sponsoring</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/trivia.php">Trivia</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/docs.php">Documentation</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/download.php">Download</a></td>
-        </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="7"></td>
-    </tr>
-    <tr>
-        <td class="checker"><img src="/images/spacer.gif" alt='' border="0" height="1"></td>
-    </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="7"></td>
-    </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/scripts/index.php">Scripts</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/tips/index.php">Tips</a></td>
-        </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/account/index.php">My Account</a></td>
-        </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="7"></td>
-    </tr>
-    <tr>
-        <td class="checker"><img src="/images/spacer.gif" alt='' border="0" height="1"></td>
-    </tr>
-    <tr>
-        <td><img src="/images/spacer.gif" alt="" border="0" width="1" height="7"></td>
-    </tr>
-        <tr>
-            <td class="sidebarheader"><a href="/huh.php">Site Help</a></td>
-        </tr>
-</table>
-
-            <table width="172" cellpadding="0" cellspacing="0" border="0">
-              <tr><td><img src="/images/spacer.gif" alt="" border="0" width="1" height="8"></td></tr>
-              <tr><td class="darkbg"><img src="/images/spacer.gif" width="1" height="3" alt=""></td></tr>
-            </table>
-            <br>
-
-<!-- INCLUDE THE PAGE SIDEBAR TEXT -->
-&nbsp;
-
-          </td>
-        </tr>
-      </table>
-    </td>
-
-    <td class="darkbg"><img src="/images/spacer.gif" width="1" height="1" border="0" alt=""><br></td>
-    <td>
-      <table width="100%" cellpadding="10" cellspacing="0" border="0" bordercolor="red">
-        <tr>
-          <td valign="top">
-
-<span class="txth1">git-commit : see your commit diff with git</span> 
-
-<br>
-<br>
-
-<!-- karma table -->
-<table cellpadding="4" cellspacing="0" border="1" bordercolor="#000066">
-<tr>
-  <td class="lightbg"><b>&nbsp;script karma&nbsp;</b></td>
-  <td>
-    Rating <b>5/2</b>,
-    Downloaded by 115  </td>
-</tr>
-</table>
-<p>
-
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td class="prompt">created by</td></tr>
-<tr><td><a href="/account/profile.php?user_id=12628">Pierre Habouzit</a></td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td class="prompt">script type</td></tr>
-<tr><td>ftplugin</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td class="prompt">description</td></tr>
-<tr><td>this ftplugin (and syntax file) brings you the ability to see the diffs of the commit you are commenting at the same time, a bit like svn-commit does.</td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td class="prompt">install details</td></tr>
-<tr><td>unpack the tar in your $HOME and add:
<br>
<br>&nbsp;&nbsp;au BufRead,BufNewFile COMMIT_EDITMSG&nbsp;&nbsp;&nbsp;&nbsp; setf git 
<br>
<br>into your .vim/filetype.vim</td></tr>
-<tr><td>&nbsp;</td></tr>
-</table>
-
-<!-- rating table -->
-<form name="rating">
-<input type="hidden" name="script_id" value="1934">
-<table cellpadding="4" cellspacing="0" border="1" bordercolor="#000066">
-<tr>
-  <td class="lightbg"><b>rate this script</b></td>
-  <td valign="middle">
-    <input type="radio" name="rating" value="life_changing">Life Changing
-    <input type="radio" name="rating" value="helpful">Helpful
-    <input type="radio" name="rating" value="unfulfilling">Unfulfilling&nbsp;
-    <input type="submit" value="rate">
-  </td>
-</tr>
-</table>
-</form>
-<span class="txth2">script versions</span> (<a href="add_script_version.php?script_id=1934">upload new version</a>)
-<p>
-Click on the package to download.
-<p>
-
-<table cellspacing="2" cellpadding="4" border="0" width="100%">
-<tr class='tableheader'>
-        <th valign="top">package</th>
-    <th valign="top">script version</th>
-    <th valign="top">date</th>
-    <th valign="top">Vim version</th>
-    <th valign="top">user</th>
-    <th valign="top">release notes</th>
-</tr>
-<tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=7990">git.tar</a></td>
-    <td class="rowodd" valign="top" nowrap><b>0.2</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2007-11-26</i></td>
-    <td class="rowodd" valign="top" nowrap>7.0</td>
-    <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=12628">Pierre Habouzit</a></i></td>
-    <td class="rowodd" valign="top" width="2000">use GIT_INDEX_FILE and git diff --stat -p --cached&#8230;
<br>
<br>thanks a lot to Junio and Jan Hudec for the tip&#8230;</td>
-</tr>
-<tr>
-        <td class="roweven" valign="top" nowrap><a href="download_script.php?src_id=7279">git.tar</a></td>
-    <td class="roweven" valign="top" nowrap><b>0.1</b></td>
-    <td class="roweven" valign="top" nowrap><i>2007-06-21</i></td>
-    <td class="roweven" valign="top" nowrap>7.0</td>
-    <td class="roweven" valign="top"><i><a href="/account/profile.php?user_id=12628">Pierre Habouzit</a></i></td>
-    <td class="roweven" valign="top" width="2000">Initial upload</td>
-</tr>
-</table>
-<!-- finish off the framework -->
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<!-- END OF THE PAGE BODY: BETWEEN HEADER AND FOOTER -->
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0" bordercolor="red">
-  <tr><td colspan="4"><img src="/images/spacer.gif" width="1" height="5" alt=""></td></tr>
-  <tr><td colspan="4" bgcolor="#000000"><img src="/images/spacer.gif" height="2" width="1" alt=""></td></tr>
-  <tr><td colspan="4"><img src="/images/spacer.gif" width="1" height="5" alt=""></td></tr>
-  <tr>
-    <td><img src="/images/spacer.gif" width="5" height="1" alt=""></td>
-
-    <td align="left" valign="top"><small>
-      If you have questions or remarks about this site, visit the
-      <a href="http://vimonline.sf.net">vimonline development</a> pages.
-      Please use this site responsibly.
-      <br> 
-      
-      Questions about <a href="http://www.vim.org/about.php">Vim</a> should go
-      to the <a href="http://www.vim.org/maillist.php">maillist</a>.
-      Help Bram <a href="http://iccf-holland.org/">help Uganda</a>.
-      </small>
-	&nbsp;
-	&nbsp;
-
-	<!-- Start of StatCounter Code -->
-	<script type="text/javascript" language="javascript">
-	var sc_project=1417324; 
-	var sc_invisible=1; 
-	var sc_partition=11; 
-	var sc_security="d41633bc"; 
-	</script>
-
-	<script type="text/javascript" language="javascript" src="http://www.statcounter.com/counter/counter.js"></script><noscript><a href="http://www.statcounter.com/" target="_blank"><img  src="http://c12.statcounter.com/counter.php?sc_project=1417324&java=0&security=d41633bc&invisible=0" alt="free tracking" border="0"></a> </noscript>
-	<!-- End of StatCounter Code -->
-          </td>
-
-    <td align="right" valign="top">
-      	<a href="http://www.webconceptgroup.net"><img src="/images/logo_sponsor_wcg.jpg" width="131" height="30" border="0" alt="Sponsored by Web Concept Group Inc."></a>
-	<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=8&type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-    </td>
-
-    <td><img src="/images/spacer.gif" width="5" height="1" alt=""></td>
-  </tr>
-
-    
-  <tr><td colspan="4"><img src="/images/spacer.gif" width="1" height="5" alt=""></td>
-  
-  </tr>
-</table>
-
-</body>
-</html>
-
diff --git a/html/index.html b/html/index.html
index 6ff077e..028f662 100644
--- a/html/index.html
+++ b/html/index.html
@@ -13,7 +13,6 @@
   <ul>
    <li><a href="autoload_omni_cpp_complete.vim.html">autoload/omni_cpp_complete.vim.html</a></li>
    <li><a href="dtd2vim.html">dtd2vim.html</a></li>
-   <li><a href="ftplugin_git.vim.html">ftplugin/git.vim.html</a></li>
    <li><a href="ftplugin_po.vim.html">ftplugin/po.vim.html</a></li>
    <li><a href="ftplugin_xml.vim.html">ftplugin/xml.vim.html</a></li>
    <li><a href="indent_python.vim.html">indent/python.vim.html</a></li>
diff --git a/syntax/git.vim b/syntax/git.vim
deleted file mode 100644
index 81cddb8..0000000
--- a/syntax/git.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-" Vim syntax file
-" Language:	git commit message
-
-" Quit when a (custom) syntax file was already loaded
-if exists("b:current_syntax")
-  finish
-endif
-
-syn region gitSignedOff start=/^Signed-off-by:/ end=/$/ contains=gitAuthor,gitEmail
-syn region gitAuthor contained start=/\s/ end=/$/
-
-syn region gitLine start=/^#/ end=/$/
-syn region gitCommit start=/^# Changes to be committed:$/ end=/^#$/ contains=gitHead,gitCommitFile
-syn region gitHead contained start=/^#   (.*)/ end=/^#$/
-syn region gitChanged start=/^# Changed but not updated:/ end=/^#$/ contains=gitHead,gitChangedFile
-syn region gitUntracked start=/^# Untracked files:/ end=/^#$/ contains=gitHead,gitUntrackedFile
-
-syn match gitCommitFile contained /^#\t.*/hs=s+2
-syn match gitChangedFile contained /^#\t.*/hs=s+2
-syn match gitUntrackedFile contained /^#\t.*/hs=s+2
-
-hi def link gitSignedOff Keyword
-hi def link gitAuthor Normal
-
-hi def link gitLine Comment
-hi def link gitCommit Comment
-hi def link gitChanged Comment
-hi def link gitHead Comment
-hi def link gitUntracked Comment
-hi def link gitCommitFile Type
-hi def link gitChangedFile Constant
-hi def link gitUntrackedFile Constant
-
-let b:current_syntax = "git"
-
-" vim: ts=8 sw=2

-- 
vim-scripts packaging



More information about the pkg-vim-maintainers mailing list