From geraud_meyer at hotmail.com Tue Apr 1 10:03:07 2008 From: geraud_meyer at hotmail.com (=?UTF-8?Q?G=C3=A9raud?= Meyer) Date: Tue, 01 Apr 2008 12:03:07 +0200 Subject: Bug#473736: vim-runtime: sh syntax problems with comments after `set', keywords, bash's `$""', nested cmd subst Message-ID: <47F2085B.10003@hotmail.com> Package: vim-runtime Version: 1:7.1.285-1 Severity: minor 1) comments after `set' In vim-set the `#' after set is black as the rest of the line. In vim-set2 `#' begins a comment. $ cat vim-set #!/bin/sh set -x # not a comment $ cat vim-set2 #!/bin/sh set -x; # a comment 2) keywords In vim-keyword the `for' in `-for-pack' is highlighted in light blue-purple outside the braces and in brown (as a keyword) inside the braces. The consequence is that the closing brace is red (for vim the `for' statement is not finished). In vim-keyword2 the `if' after `ls' (name of a file) is highlighted in brown (as a keyword) even outside braces, whereas the `for' after `echo' is not (in pink like a string) (echo arguments must be treated differently). $ cat vim-keyword #!/bin/sh ocamlopt -for-pack truc { ocamlopt -for-pack truc } $ cat vim-keyword2 #!/bin/sh echo for ls if 3) bash's `$""' $'' is recognized as a bashism ($ is brown) but not $"" ($ is pink). $ cat vim-bashstring #!/bin/bash echo $"hello" $'world' 4) nested command substitution The outer $() is red (indicating an error). This is not the case in posix mode so it might not constitute a bug. I was just wondering if nested command substitution should be enabled in the default sh mode. $ cat vim-cmdsubst #!/bin/sh echo $(echo $(echo 1) 2) 3 -- System Information: Debian Release: lenny/sid APT prefers unstable Architecture: i386 (i686) Kernel: Linux 2.6.24-desk1-k7 (PREEMPT) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash vim-runtime depends on no packages. Versions of packages vim-runtime recommends: ii vim-gtk [vim] 1:7.1.285-1 Vi IMproved - enhanced vi editor - -- debconf-show failed From telenieko at telenieko.com Tue Apr 1 11:56:07 2008 From: telenieko at telenieko.com (Marc Fargas) Date: Tue, 01 Apr 2008 13:56:07 +0200 Subject: Bug#473744: vim-scripts: Please ship "snippetsEmu" Message-ID: <20080401115607.10081.94914.reportbug@castor.fargas.local> Package: vim-scripts Version: 7.1.6 Severity: wishlist Hi, I really love the "vim-addons install + + + + + + + SourceForge.net Logo + + + + + + + + + + + + + + Added: trunk/packages/vim-scripts/plugin/detectindent.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/detectindent.vim?rev=1238&op=file ============================================================================== --- trunk/packages/vim-scripts/plugin/detectindent.vim (added) +++ trunk/packages/vim-scripts/plugin/detectindent.vim Tue Apr 8 15:29:51 2008 @@ -1,0 +1,127 @@ +" Name: detectindent (global plugin) +" Version: 1.0 +" Author: Ciaran McCreesh +" Updates: http://dev.gentoo.org/~ciaranm/vim/ +" Purpose: Detect file indent settings +" +" License: You may redistribute this plugin under the same terms as Vim +" itself. +" +" Usage: :DetectIndent +" +" " to prefer expandtab to noexpandtab when detection is +" " impossible: +" :let g:detectindent_preferred_expandtab = 1 +" +" " to set a preferred indent level when detection is +" " impossible: +" :let g:detectindent_preferred_indent = 4 +" +" Requirements: Untested on Vim versions below 6.2 + +fun! IsCommentStart(line) + " &comments isn't reliable + if &ft == "c" || &ft == "cpp" + return -1 != match(a:line, '/\*') + else + return 0 + endif +endfun + +fun! IsCommentEnd(line) + if &ft == "c" || &ft == "cpp" + return -1 != match(a:line, '\*/') + else + return 0 + endif +endfun + +fun! DetectIndent() + let l:has_leading_tabs = 0 + let l:has_leading_spaces = 0 + let l:shortest_leading_spaces_run = 0 + let l:longest_leading_spaces_run = 0 + + let l:idx_end = line("$") + let l:idx = 1 + while l:idx <= l:idx_end + let l:line = getline(l:idx) + + " try to skip over comment blocks, they can give really screwy indent + " settings in c/c++ files especially + if IsCommentStart(l:line) + while l:idx <= l:idx_end && ! IsCommentEnd(l:line) + let l:line = getline(l:idx) + let l:idx = l:idx + 1 + endwhile + let l:idx = l:idx + 1 + continue + endif + + let l:leading_char = strpart(l:line, 0, 1) + + if l:leading_char == "\t" + let l:has_leading_tabs = 1 + + elseif l:leading_char == " " + " only interested if we don't have a run of spaces followed by a + " tab. + if -1 == match(l:line, '^ \+\t') + let l:has_leading_spaces = 1 + let l:spaces = strlen(matchstr(l:line, '^ \+')) + if l:shortest_leading_spaces_run == 0 || + \ l:spaces < l:shortest_leading_spaces_run + let l:shortest_leading_spaces_run = l:spaces + endif + if l:spaces > l:longest_leading_spaces_run + let l:longest_leading_spaces_run = l:spaces + endif + endif + + endif + + let l:idx = l:idx + 1 + endwhile + + if l:has_leading_tabs && ! l:has_leading_spaces + " tabs only, no spaces + set noexpandtab + if exists("g:detectindent_preferred_tabsize") + let &shiftwidth = g:detectindent_preferred_indent + let &tabstop = g:detectindent_preferred_indent + endif + + elseif l:has_leading_spaces && ! l:has_leading_tabs + " spaces only, no tabs + set expandtab + let &shiftwidth = l:shortest_leading_spaces_run + + elseif l:has_leading_spaces && l:has_leading_tabs + " spaces and tabs + set noexpandtab + let &shiftwidth = l:shortest_leading_spaces_run + + " mmmm, time to guess how big tabs are + if l:longest_leading_spaces_run < 2 + let &tabstop = 2 + elseif l:longest_leading_spaces_run < 4 + let &tabstop = 4 + else + let &tabstop = 8 + endif + + else + " no spaces, no tabs + if exists("g:detectindent_preferred_tabsize") + let &shiftwidth = g:detectindent_preferred_indent + let &tabstop = g:detectindent_preferred_indent + endif + if exists("g:detectindent_preferred_expandtab") + set expandtab + endif + + endif +endfun + +command! -nargs=0 DetectIndent call DetectIndent() + From jamessan at debian.org Tue Apr 8 15:30:02 2008 From: jamessan at debian.org (James Vega) Date: Tue, 08 Apr 2008 11:30:02 -0400 Subject: Bug#471890: setting package to vim-scripts, tagging 471890 Message-ID: <1207668602-272-bts-jamessan@debian.org> # Automatically generated email from bts, devscripts version 2.10.23 # # vim-scripts (7.1.7) UNRELEASED; urgency=low # # * New addons: # - DetectIndent: Automatically detect indent settings (Closes: #471890) # package vim-scripts tags 471890 + pending From owner at bugs.debian.org Tue Apr 8 15:33:07 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Tue, 08 Apr 2008 15:33:07 +0000 Subject: Processed: setting package to vim-scripts, tagging 471890 In-Reply-To: <1207668602-272-bts-jamessan@debian.org> References: <1207668602-272-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.23 > # > # vim-scripts (7.1.7) UNRELEASED; urgency=low > # > # * New addons: > # - DetectIndent: Automatically detect indent settings (Closes: #471890) > # > package vim-scripts Ignoring bugs not assigned to: vim-scripts > tags 471890 + pending Bug#471890: vim-scripts: please include DetectIndent script on the package There were no tags set. Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From jamessan at users.alioth.debian.org Tue Apr 8 20:02:24 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 20:02:24 -0000 Subject: r1239 - in /trunk/packages/vim-scripts: debian/changelog debian/vim-scripts.status html/index.html html/plugin_surround.vim.html plugin/surround.vim Message-ID: Author: jamessan Date: Tue Apr 8 20:02:23 2008 New Revision: 1239 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1239 Log: - xmledit, surround Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/html/index.html trunk/packages/vim-scripts/html/plugin_surround.vim.html trunk/packages/vim-scripts/plugin/surround.vim Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1239&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Tue Apr 8 20:02:23 2008 @@ -7,7 +7,7 @@ being run in other buffers. Thanks to Marvin Renich for the patch fix. (Closes: #465330) * Updated addons: - - xmledit + - xmledit, surround * New addons: - DetectIndent: Automatically detect indent settings (Closes: #471890) Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1239&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr 8 20:02:23 2008 @@ -377,7 +377,7 @@ license: Vim's license [4], see below extras: doc/surround.txt disabledby: let loaded_surround = 1 -version: 1.33 +version: 1.34 script_name: syntax/mkd.vim addon: markdown-syntax Modified: trunk/packages/vim-scripts/html/index.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1239&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/index.html (original) +++ trunk/packages/vim-scripts/html/index.html Tue Apr 8 20:02:23 2008 @@ -49,7 +49,7 @@
  • syntax/mkd.vim.html
  • - Page generated on Tue, 08 Apr 2008 11:26:48 -0400 + Page generated on Tue, 08 Apr 2008 16:01:24 -0400 .

    Modified: trunk/packages/vim-scripts/html/plugin_surround.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_surround.vim.html?rev=1239&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/plugin_surround.vim.html (original) +++ trunk/packages/vim-scripts/html/plugin_surround.vim.html Tue Apr 8 20:02:23 2008 @@ -153,8 +153,8 @@  script karma  - Rating 481/135, - Downloaded by 3395 + Rating 523/147, + Downloaded by 3968

    @@ -204,100 +204,108 @@ release notes - surround.zip - 1.33 - 2008-02-03 - 7.0 - Tim Pope - Fixed regressions from previous release.
    This is really planned as the last release with partial Vim 6.0 compatibility. - - - surround.zip - 1.30 - 2008-01-27 - 7.0 - Tim Pope - Fixed edge case where ds could move a multiline inner text down one line.
    This is planned as the last release with partial Vim 6.0 compatibility. - - - surround.zip - 1.27 - 2007-10-03 - 7.0 - Tim Pope - Fixed multiline surrounds in insert mode
    - - - surround.vim - 1.26 - 2007-07-31 - 7.0 - Tim Pope - Added a /* C style comment */ target.
    Insert mode indenting limited to multiline insertions. - - - surround.zip - 1.24 - 2007-05-10 - 7.0 - Tim Pope - surround_indent now works in insert mode.
    Added <C-]> to add braces on separate lines. - - - surround.zip - 1.23 - 2007-02-16 - 7.0 - Tim Pope - xmap rather than vmap, to avoid interfering with select mode.
    surround_insert_tail to specify a universal suffix for use in insert mode. - - - surround.zip - 1.22 - 2007-02-11 - 7.0 - Tim Pope - Function properly when clipboard=unnamed
    Very experimental custom prompting for substitution text - - - surround.zip - 1.18 - 2006-11-13 - 7.0 - Tim Pope - Zip file instead of documentation extraction hack - - - surround.vim - 1.17 - 2006-11-09 + surround.zip + 1.34 + 2008-02-15 6.0 Tim Pope - Insert mode mapping that doesn't conflict with flow control.
    Fixed edge case with ys where one too many characters would be grabbed. - - - surround.vim - 1.16 - 2006-11-05 - 7.0 - Tim Pope - S in blockwise visual mode strips trailing whitespace. - - - surround.vim - 1.12 - 2006-10-31 - 7.0 - Tim Pope - Lots of tiny bug fixes and cleanup.
    "S" mappings to force surroundings onto a separate line.
    Support for blockwise visual mode. - - - surround.vim - 1.6 - 2006-10-29 - 7.0 - Tim Pope - Initial upload + One more regression fix.
    This is really really planned as the last release with partial Vim 6.0 compatibility  (third time's the charm). + + + surround.zip + 1.33 + 2008-02-03 + 7.0 + Tim Pope + Fixed regressions from previous release.
    This is really planned as the last release with partial Vim 6.0 compatibility. + + + surround.zip + 1.30 + 2008-01-27 + 7.0 + Tim Pope + Fixed edge case where ds could move a multiline inner text down one line.
    This is planned as the last release with partial Vim 6.0 compatibility. + + + surround.zip + 1.27 + 2007-10-03 + 7.0 + Tim Pope + Fixed multiline surrounds in insert mode
    + + + surround.vim + 1.26 + 2007-07-31 + 7.0 + Tim Pope + Added a /* C style comment */ target.
    Insert mode indenting limited to multiline insertions. + + + surround.zip + 1.24 + 2007-05-10 + 7.0 + Tim Pope + surround_indent now works in insert mode.
    Added <C-]> to add braces on separate lines. + + + surround.zip + 1.23 + 2007-02-16 + 7.0 + Tim Pope + xmap rather than vmap, to avoid interfering with select mode.
    surround_insert_tail to specify a universal suffix for use in insert mode. + + + surround.zip + 1.22 + 2007-02-11 + 7.0 + Tim Pope + Function properly when clipboard=unnamed
    Very experimental custom prompting for substitution text + + + surround.zip + 1.18 + 2006-11-13 + 7.0 + Tim Pope + Zip file instead of documentation extraction hack + + + surround.vim + 1.17 + 2006-11-09 + 6.0 + Tim Pope + Insert mode mapping that doesn't conflict with flow control.
    Fixed edge case with ys where one too many characters would be grabbed. + + + surround.vim + 1.16 + 2006-11-05 + 7.0 + Tim Pope + S in blockwise visual mode strips trailing whitespace. + + + surround.vim + 1.12 + 2006-10-31 + 7.0 + Tim Pope + Lots of tiny bug fixes and cleanup.
    "S" mappings to force surroundings onto a separate line.
    Support for blockwise visual mode. + + + surround.vim + 1.6 + 2006-10-29 + 7.0 + Tim Pope + Initial upload @@ -343,8 +351,7 @@ - Sponsored by Web Concept Group Inc. - SourceForge.net Logo + SourceForge.net Logo Modified: trunk/packages/vim-scripts/plugin/surround.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/surround.vim?rev=1239&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/surround.vim (original) +++ trunk/packages/vim-scripts/plugin/surround.vim Tue Apr 8 20:02:23 2008 @@ -1,7 +1,7 @@ " surround.vim - Surroundings " Author: Tim Pope " GetLatestVimScripts: 1697 1 :AutoInstall: surround.vim -" $Id: surround.vim,v 1.33 2008-02-04 03:50:46 tpope Exp $ +" $Id: surround.vim,v 1.34 2008-02-15 21:43:42 tpope Exp $ " " See surround.txt for help. This can be accessed by doing " @@ -424,10 +424,6 @@ exe 'norm '.strcount.'[/d'.strcount.']/' else exe 'norm d'.strcount.'i'.char - " One character backwards - if getreg('"') != "" - call search('.','bW') - endif endif let keeper = getreg('"') let okeeper = keeper " for reindent below @@ -444,13 +440,15 @@ " Do nothing call setreg('"','') elseif char =~ "[\"'`]" - exe "norm! a \d2i".char + exe "norm! i \d2i".char call setreg('"',substitute(getreg('"'),' ','','')) elseif char == '/' norm! "_x call setreg('"','/**/',"c") let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','') else + " One character backwards + call search('.','bW') exe "norm da".char endif let removed = getreg('"') From jamessan at users.alioth.debian.org Tue Apr 8 20:08:25 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 20:08:25 -0000 Subject: r1240 - in /trunk/packages/vim-scripts: autoload/deb.vim debian/changelog debian/vim-scripts.status html/index.html html/plugin_debPlugin.vim.html Message-ID: Author: jamessan Date: Tue Apr 8 20:08:25 2008 New Revision: 1240 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1240 Log: Update debPlugin Modified: trunk/packages/vim-scripts/autoload/deb.vim trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/html/index.html trunk/packages/vim-scripts/html/plugin_debPlugin.vim.html Modified: trunk/packages/vim-scripts/autoload/deb.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/autoload/deb.vim?rev=1240&op=diff ============================================================================== --- trunk/packages/vim-scripts/autoload/deb.vim (original) +++ trunk/packages/vim-scripts/autoload/deb.vim Tue Apr 8 20:08:25 2008 @@ -1,7 +1,7 @@ " Vim autoload file for browsing debian package. -" copyright (C) 2007, arno renevier +" copyright (C) 2007-2008, arno renevier " Distributed under the GNU General Public License (version 2 or above) -" Last Change: 2007 december 21 +" Last Change: 2008 april 1 " " Inspired by autoload/tar.vim by Charles E Campbell " @@ -13,7 +13,237 @@ if &cp || exists("g:loaded_deb") || v:version < 700 finish endif -let g:loaded_deb= "v1.3" +let g:loaded_deb= "v1.4" + +fun! deb#read(debfile, member) + + " checks if ar and tar are installed + if !s:hascmd("ar") || !s:hascmd("tar") + return + endif + + let l:target = a:member + + let l:archmember = s:dataFileName(a:debfile) " default archive member to extract + if l:archmember == "" + echohl WarningMsg | echo "***error*** (deb#read) no valid data file found in debian archive" + return + elseif l:archmember == "data.tar.gz" + let l:unpcmp = "tar zxfO " + elseif l:archmember == "data.tar.bz2" + let l:unpcmp = "tar jxfO " + elseif l:archmember == "data.tar.lzma" + if !s:hascmd("lzma") + return + endif + let l:unpcmp = "lzma -d | tar xfO " + elseif l:archmember == "data.tar" + let l:unpcmp = "tar xfO " + endif + + if a:member =~ '^\* ' " information control file + let l:archmember = "control.tar.gz" + let l:target = substitute(l:target, "^\* ", "", "") + let l:unpcmp = "tar zxfO " + elseif a:member =~ ' -> ' " symbolic link + let l:target = split(a:member,' -> ')[0] + let l:linkname = split(a:member,' -> ')[1] + + if l:linkname =~ "^\/" " direct symlink: path is already absolute + let l:target = ".".l:linkname + + else + " transform relative path to absolute path + + " first, get basename for target + let l:target = substitute(l:target, "\/[^/]*$", "", "") + + " while it begins with ../ + while l:linkname =~ "^\.\.\/" + + " removes one level of ../ in linkname + let l:linkname = substitute(l:linkname, "^\.\.\/", "", "") + + " go one directory up in target + let l:target = substitute(l:target, "\/[^/]*$", "", "") + endwhile + + let l:target = l:target."/".l:linkname + endif + endif + + " we may preprocess some files (such as man pages, or changelogs) + let l:preproccmd = "" + + " + " unzip man pages + " + if l:target =~ "\.\/usr\/share\/man\/.*\.gz$" + + " try to fail gracefully if a command is not available + if !s:hascmd("gzip") + return + elseif !s:hascmd("nroff") + let l:preproccmd = "| gzip -cd" + elseif !s:hascmd("col") + let l:preproccmd = "| gzip -cd | nroff -mandoc" + else + let l:preproccmd = "| gzip -cd | nroff -mandoc | col -b" + endif + + " + " unzip other .gz files + " + elseif l:target =~ '.*\.gz$' + if !s:hascmd("gzip") + return + endif + let l:preproccmd = "| gzip -cd" + endif + + " read content + exe "silent r! ar p " . s:QuoteFile(a:debfile) . " " . s:QuoteFile(l:archmember) . " | " . l:unpcmp . " - " . s:QuoteFile(l:target) . l:preproccmd + " error will be treated in calling function + if v:shell_error != 0 + return + endif + + exe "file deb:".l:target + + 0d + + setlocal nomodifiable nomodified readonly + +endfun + +fun! deb#browse(file) + + " checks if necessary utils are installed + if !s:hascmd("dpkg") || !s:hascmd("ar") || !s:hascmd("tar") + return + endif + + " checks if file is readable + if !filereadable(a:file) + return + endif + if a:file =~ "'" + echohl WarningMsg | echo "***error*** (deb#Browse) filename cannot contain quote character (" . a:file . ")" + return + endif + + let keepmagic = &magic + set magic + + " set filetype to "deb" + set ft=deb + + setlocal modifiable noreadonly + + " set header + exe "$put ='".'\"'." deb.vim version ".g:loaded_deb."'" + exe "$put ='".'\"'." Browsing debian package ".a:file."'" + $put='' + + " package info + "exe "silent read! dpkg -I ".a:file + "$put='' + + " display information control files + let l:infopos = line(".") + exe "silent read! ar p " . s:QuoteFile(a:file) . " control.tar.gz | tar zt" + + $put='' + + " display data files + let l:listpos = line(".") + exe "silent read! dpkg -c ". s:QuoteFile(a:file) + + " format information control list + " removes '* ./' line + exe (l:infopos + 1). 'd' + " add a star before each line + exe "silent " . (l:infopos + 1). ',' . (l:listpos - 2) . 's/^/\* /' + + " format data list + exe "silent " . l:listpos . ',$s/^.*\s\(\.\/\(\S\|\).*\)$/\1/' + + if v:shell_error != 0 + echohl WarningMsg | echo "***warning*** (deb#Browse) error when listing content of " . a:file + let &magic = keepmagic + return + endif + + 0d + + setlocal nomodifiable readonly + noremap :call DebBrowseSelect() + let &magic = keepmagic + +endfun + +fun! s:DebBrowseSelect() + let l:fname= getline(".") + + " sanity check + if (l:fname !~ '^\.\/') && (l:fname !~ '^\* \.\/') + return + endif + if l:fname =~ "'" + echohl WarningMsg | echo "***error*** (DebBrowseSelect) filename cannot contain quote character (" . l:fname . ")" + return + endif + + " do nothing on directories + " TODO: find a way to detect symlinks to directories, to be able not to + " open them + if (l:fname =~ '\/$') + return + endif + + " need to get it now since a new window will open + let l:curfile= expand("%") + + " open new window + new + wincmd _ + + call deb#read(l:curfile, l:fname) + + if v:shell_error != 0 + echohl WarningMsg | echo "***warning*** (DebBrowseSelect) error when reading " . l:fname + return + endif + + filetype detect + + " zipped files, are unziped in deb#read, but filetype may not + " automatically work. + if l:fname =~ "\.\/usr\/share\/man\/.*\.gz$" + set filetype=man + elseif l:fname =~ "\.\/usr\/share\/doc\/.*\/changelog.Debian.gz$" + set filetype=debchangelog + endif + +endfun + +" return data file name for debian package. This can be either data.tar.gz, +" data.tar.bz2 or data.tar.lzma +fun s:dataFileName(deb) + for fn in ["data.tar.gz", "data.tar.bz2", "data.tar.lzma", "data.tar"] + " [0:-2] is to remove trailing null character from command output + if (system("ar t " . "'" . a:deb . "'" . " " . fn))[0:-2] == fn + return fn + endif + endfor + return "" " no debian data format in this archive +endfun + +fun s:QuoteFile(file) + " we need to escape %, #, <, and > + " see :help cmdline-specialk + return "'" . substitute(a:file, '\([%#<>]\)', '\\\1', 'g') . "'" +endfun " return 1 if cmd exists " display error message and return 0 otherwise @@ -26,190 +256,3 @@ else endfu -fun! deb#read(debfile, member) - - " checks if ar and tar are installed - if !s:hascmd("ar") || !s:hascmd("tar") - return - endif - - let l:archmember = "data.tar.gz" " default archive member to extract - let l:target = a:member - - - if a:member =~ '^\* ' " information control file - let l:archmember = "control.tar.gz" - let l:target = substitute(l:target, "^\* ", "", "") - - elseif a:member =~ ' -> ' " symbolic link - let l:target = split(a:member,' -> ')[0] - let l:linkname = split(a:member,' -> ')[1] - - if l:linkname =~ "^\/" " direct symlink: path is already absolute - let l:target = ".".l:linkname - - else - " transform relative path to absolute path - - " first, get basename for target - let l:target = substitute(l:target, "\/[^/]*$", "", "") - - " while it begins with ../ - while l:linkname =~ "^\.\.\/" - - " removes one level of ../ in linkname - let l:linkname = substitute(l:linkname, "^\.\.\/", "", "") - - " go one directory up in target - let l:target = substitute(l:target, "\/[^/]*$", "", "") - endwhile - - let l:target = l:target."/".l:linkname - endif - endif - - let l:gunzip_cmd = "" - - " - " unzip man pages - " - if l:target =~ "\.\/usr\/share\/man\/.*\.gz$" - - " try to fail gracefully if a command is not available - if !s:hascmd("gzip") - return - elseif !s:hascmd("nroff") - let l:gunzip_cmd = "| gzip -cd" - elseif !s:hascmd("col") - let l:gunzip_cmd = "| gzip -cd | nroff -mandoc" - else - let l:gunzip_cmd = "| gzip -cd | nroff -mandoc | col -b" - endif - - " - " unzip other .gz files - " - elseif l:target =~ '.*\.gz$' - if !s:hascmd("gzip") - return - endif - let l:gunzip_cmd = "| gzip -cd" - endif - - " read content - exe "silent r! ar p " . "'" . a:debfile . "'" . " " . l:archmember . " | tar zxfO - '" . l:target . "'" . l:gunzip_cmd - " error will be treated in calling function - if v:shell_error != 0 - return - endif - - exe "file deb:".l:target - - 0d - - setlocal nomodifiable nomodified readonly - -endfun - -fun! deb#browse(file) - - " checks if necessary utils are installed - if !s:hascmd("dpkg") || !s:hascmd("ar") || !s:hascmd("tar") - return - endif - - " checks if file is readable - if !filereadable(a:file) - return - endif - - let keepmagic = &magic - set magic - - " set filetype to "deb" - set ft=deb - - setlocal modifiable noreadonly - - " set header - exe "$put ='".'\"'." deb.vim version ".g:loaded_deb."'" - exe "$put ='".'\"'." Browsing debian package ".a:file."'" - $put='' - - " package info - "exe "silent read! dpkg -I ".a:file - "$put='' - - " display information control files - let l:infopos = line(".") - exe "silent read! ar p '" . a:file . "' control.tar.gz | tar zt" - - $put='' - - " display data files - let l:listpos = line(".") - exe "silent read! dpkg -c ".a:file - - " format information control list - " removes '* ./' line - exe (l:infopos + 1). 'd' - " add a star before each line - exe "silent " . (l:infopos + 1). ',' . (l:listpos - 2) . 's/^/\* /' - - " format data list - exe "silent " . l:listpos . ',$s/^.*\s\(\.\/\(\S\|\).*\)$/\1/' - - if v:shell_error != 0 - echohl WarningMsg | echo "***warning*** (deb#Browse) error when listing content of " . a:file - let &magic = keepmagic - return - endif - - 0d - - setlocal nomodifiable readonly - noremap :call DebBrowseSelect() - let &magic = keepmagic - -endfun - -fun! s:DebBrowseSelect() - let l:fname= getline(".") - - " sanity check - if (l:fname !~ '^\.\/') && (l:fname !~ '^\* \.\/') - return - endif - - " do nothing on directories - " TODO: find a way to detect symlinks to directories, to be able not to - " open them - if (l:fname =~ '\/$') - return - endif - - " need to get it now since a new window will open - let l:curfile= expand("%") - - " open new window - new - wincmd _ - - call deb#read(l:curfile, l:fname) - - if v:shell_error != 0 - echohl WarningMsg | echo "***warning*** (DebBrowseSelect) error when reading " . l:fname - return - endif - - filetype detect - - " zipped files, are unziped in deb#read, but filetype may not - " automatically work. - if l:fname =~ "\.\/usr\/share\/man\/.*\.gz$" - set filetype=man - elseif l:fname =~ "\.\/usr\/share\/doc\/.*\/changelog.Debian.gz$" - set filetype=debchangelog - endif - -endfun Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1240&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Tue Apr 8 20:08:25 2008 @@ -7,9 +7,10 @@ being run in other buffers. Thanks to Marvin Renich for the patch fix. (Closes: #465330) * Updated addons: - - xmledit, surround + - xmledit, surround, debPlugin * New addons: - DetectIndent: Automatically detect indent settings (Closes: #471890) + * -- James Vega Tue, 05 Feb 2008 17:06:54 -0500 Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1240&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr 8 20:08:25 2008 @@ -354,7 +354,7 @@ license: GNU GPL, see /usr/share/common-licenses/GPL-2 extras: autoload/deb.vim syntax/deb.vim disabledby: let loaded_debPlugin = 1 -version: 1.3 +version: v1.4 script_name: indent/python.vim addon: python-indent Modified: trunk/packages/vim-scripts/html/index.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1240&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/index.html (original) +++ trunk/packages/vim-scripts/html/index.html Tue Apr 8 20:08:25 2008 @@ -49,7 +49,7 @@

  • syntax/mkd.vim.html
  • - Page generated on Tue, 08 Apr 2008 16:01:24 -0400 + Page generated on Tue, 08 Apr 2008 16:07:28 -0400 .

    Modified: trunk/packages/vim-scripts/html/plugin_debPlugin.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_debPlugin.vim.html?rev=1240&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/plugin_debPlugin.vim.html (original) +++ trunk/packages/vim-scripts/html/plugin_debPlugin.vim.html Tue Apr 8 20:08:25 2008 @@ -153,8 +153,8 @@  script karma  - Rating 6/3, - Downloaded by 126 + Rating 7/4, + Downloaded by 267

    @@ -204,6 +204,22 @@ release notes + deb.zip + v1.4 + 2008-04-02 + 7.0 + arno. + fixes: could not open files with # or % in file name

    add support for data.tar.bz2, data.tar.lzma and data.tar + + + deb.zip + 1.3 + 2007-12-21 + 7.0 + arno. + format man pages + + deb.zip 1.2 2007-12-07 @@ -271,8 +287,7 @@ - Sponsored by Web Concept Group Inc. - SourceForge.net Logo + SourceForge.net Logo From jamessan at users.alioth.debian.org Tue Apr 8 20:21:47 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 20:21:47 -0000 Subject: r1241 - in /trunk/packages/vim-scripts: debian/changelog debian/vim-scripts.status html/index.html html/syntax_mkd.vim.html syntax/mkd.vim Message-ID: Author: jamessan Date: Tue Apr 8 20:21:47 2008 New Revision: 1241 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1241 Log: Update Markdown syntax Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/html/index.html trunk/packages/vim-scripts/html/syntax_mkd.vim.html trunk/packages/vim-scripts/syntax/mkd.vim Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1241&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Tue Apr 8 20:21:47 2008 @@ -7,10 +7,9 @@ being run in other buffers. Thanks to Marvin Renich for the patch fix. (Closes: #465330) * Updated addons: - - xmledit, surround, debPlugin + - xmledit, surround, debPlugin, Markdown syntax * New addons: - DetectIndent: Automatically detect indent settings (Closes: #471890) - * -- James Vega Tue, 05 Feb 2008 17:06:54 -0500 Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1241&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr 8 20:21:47 2008 @@ -387,7 +387,7 @@ author_url: http://www.vim.org/account/profile.php?user_id=5655 email: benw at plasticboy.com license: no license -version: 6 +version: 7 script_name: plugin/detectindent.vim addon: detectindent Modified: trunk/packages/vim-scripts/html/index.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1241&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/index.html (original) +++ trunk/packages/vim-scripts/html/index.html Tue Apr 8 20:21:47 2008 @@ -49,7 +49,7 @@

  • syntax/mkd.vim.html
  • - Page generated on Tue, 08 Apr 2008 16:07:28 -0400 + Page generated on Tue, 08 Apr 2008 16:15:47 -0400 .

    Modified: trunk/packages/vim-scripts/html/syntax_mkd.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/syntax_mkd.vim.html?rev=1241&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/syntax_mkd.vim.html (original) +++ trunk/packages/vim-scripts/html/syntax_mkd.vim.html Tue Apr 8 20:21:47 2008 @@ -154,7 +154,7 @@  script karma  Rating 31/19, - Downloaded by 896 + Downloaded by 1048

    @@ -204,44 +204,52 @@ release notes - mkd.vim - 6 - 2006-09-01 + mkd.vim + 7 + 2008-03-01 6.0 Ben Williams - Enables spellchecking in Vim 7 and adds highlighting for reference-style links thanks to Will Norris. - - - mkd.vim - 5 - 2005-12-01 + Fixes several bugs, most thanks to David Wolever:
        * Don?t match bold and underline characters inside of words.
        * Don?t match code blocks that aren?t preceded by a blank line.
        * Fix double back-tick code blocks without a back-tick inside of them.
        * Fix # headings being matched anywhere in the line.
        * Match <pre> and <code> tags.

    + + + mkd.vim + 6 + 2006-09-01 6.0 Ben Williams - Fixes numbered headings being highlighted as list items and horizontal rules being highlighted as headings. Thanks to Stephen Haberman. - - - mkd.vim - 4 - 2005-08-24 + Enables spellchecking in Vim 7 and adds highlighting for reference-style links thanks to Will Norris. + + + mkd.vim + 5 + 2005-12-01 6.0 Ben Williams - Fixes stuff in parentheses being highlighted when not part of a link structure. - - - mkd.vim - 3 - 2005-05-05 + Fixes numbered headings being highlighted as list items and horizontal rules being highlighted as headings. Thanks to Stephen Haberman. + + + mkd.vim + 4 + 2005-08-24 6.0 Ben Williams - Fixes a problem with indented lists being highlighted as code blocks. - - - mkd.vim - 2 - 2005-03-21 + Fixes stuff in parentheses being highlighted when not part of a link structure. + + + mkd.vim + 3 + 2005-05-05 6.0 Ben Williams - Initial upload + Fixes a problem with indented lists being highlighted as code blocks. + + + mkd.vim + 2 + 2005-03-21 + 6.0 + Ben Williams + Initial upload @@ -287,8 +295,7 @@ - Sponsored by Web Concept Group Inc. - SourceForge.net Logo + SourceForge.net Logo Modified: trunk/packages/vim-scripts/syntax/mkd.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/syntax/mkd.vim?rev=1241&op=diff ============================================================================== --- trunk/packages/vim-scripts/syntax/mkd.vim (original) +++ trunk/packages/vim-scripts/syntax/mkd.vim Tue Apr 8 20:21:47 2008 @@ -2,8 +2,8 @@ " Language: Markdown " Maintainer: Ben Williams " URL: http://plasticboy.com/markdown-vim-mode/ -" Version: 6 -" Last Change: 2006 September 1 +" Version: 7 +" Last Change: 2008 March 1 " Remark: Uses HTML syntax file " Remark: I don't do anything with angle brackets (<>) because that would too easily " easily conflict with HTML syntax @@ -38,11 +38,11 @@ "additions to HTML groups syn region htmlBold start=/\*\@/ end=/$/ contains=mkdLineContinue +syn region mkdCode start=/\s*``[^`]*/ end=/[^`]*``\s*/ +syn region mkdBlockquote start=/^\s*>/ end=/$/ contains=mkdLineContinue, at Spell +syn region mkdCode start="]*>" end="" +syn region mkdCode start="]*>" end="" "HTML headings -syn region htmlH1 start="#" end="\($\|#\+\)" -syn region htmlH2 start="##" end="\($\|#\+\)" -syn region htmlH3 start="###" end="\($\|#\+\)" -syn region htmlH4 start="####" end="\($\|#\+\)" -syn region htmlH5 start="#####" end="\($\|#\+\)" -syn region htmlH6 start="######" end="\($\|#\+\)" -syn match htmlH1 /^.\+\n=\+$/ -syn match htmlH2 /^.\+\n-\+$/ +syn region htmlH1 start="^\s*#" end="\($\|#\+\)" contains=@Spell +syn region htmlH2 start="^\s*##" end="\($\|#\+\)" contains=@Spell +syn region htmlH3 start="^\s*###" end="\($\|#\+\)" contains=@Spell +syn region htmlH4 start="^\s*####" end="\($\|#\+\)" contains=@Spell +syn region htmlH5 start="^\s*#####" end="\($\|#\+\)" contains=@Spell +syn region htmlH6 start="^\s*######" end="\($\|#\+\)" contains=@Spell +syn match htmlH1 /^.\+\n=\+$/ contains=@Spell +syn match htmlH2 /^.\+\n-\+$/ contains=@Spell "highlighting for Markdown groups HtmlHiLink mkdString String From jamessan at users.alioth.debian.org Tue Apr 8 20:27:44 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 20:27:44 -0000 Subject: r1242 - in /trunk/packages/vim-scripts: debian/changelog debian/vim-scripts.status doc/NERD_commenter.txt html/index.html html/plugin_NERD_commenter.vim.html plugin/NERD_commenter.vim Message-ID: Author: jamessan Date: Tue Apr 8 20:27:44 2008 New Revision: 1242 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1242 Log: Update NERD Commenter Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/doc/NERD_commenter.txt trunk/packages/vim-scripts/html/index.html trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html trunk/packages/vim-scripts/plugin/NERD_commenter.vim Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1242&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Tue Apr 8 20:27:44 2008 @@ -7,9 +7,10 @@ being run in other buffers. Thanks to Marvin Renich for the patch fix. (Closes: #465330) * Updated addons: - - xmledit, surround, debPlugin, Markdown syntax + - xmledit, surround, debPlugin, Markdown syntax, NERD Commenter * New addons: - DetectIndent: Automatically detect indent settings (Closes: #471890) + * -- James Vega Tue, 05 Feb 2008 17:06:54 -0500 Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1242&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr 8 20:27:44 2008 @@ -253,7 +253,7 @@ license: no license extras: doc/NERD_commenter.txt disabledby: let loaded_nerd_comments = 1 -version: 2.1.9 +version: 2.1.12 script_name: plugin/project.vim addon: project Modified: trunk/packages/vim-scripts/doc/NERD_commenter.txt URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/doc/NERD_commenter.txt?rev=1242&op=diff ============================================================================== --- trunk/packages/vim-scripts/doc/NERD_commenter.txt (original) +++ trunk/packages/vim-scripts/doc/NERD_commenter.txt Tue Apr 8 20:27:44 2008 @@ -860,6 +860,23 @@ ============================================================================== 8. Changelog *NERDComChangelog* +2.1.12 + - added support for patran and dakota, thx to Jacobo Diaz for the email + - added support for gentoo-env-d, gentoo-init-d, gentoo-make-conf, grub, + modconf and sudoers filetypes, thx to Li Jin for the patch. + - added support for SVNdiff, gitAnnotate, gitdiff. Thx to nicothakis for + posting the issue + +2.1.11 + - fixed a bug with the selection option and visual commenting (again). + Thanks to Ingo Karkat (again). + +2.1.10 + - added support for Wikipedia (thanks to Chen Xing) + - added support for mplayerconf + - bugfixes (thanks to Ingo Karkat for the bug report/patch) + - added support for mkd (thanks to Stefano Zacchiroli) + 2.1.9 - added support for mrxvtrc and aap, thx to Marco for the emails - added dummy support for SVNAnnotate, SVKAnnotate and CVSAnnotate, thx to @@ -1148,6 +1165,8 @@ comments and the NERDSpaceDelims option. Thanks to marco for suggesting NERDDefaultNesting be set by default. + +Thanks to Ingo Karkat for the bug reports and the bugfix patch. Not to forget! Thanks to the following people for sending me new filetypes to support :D @@ -1171,7 +1190,7 @@ Michael B??hler autoit, autohotkey and docbk Aaron Small cmake Ramiro htmldjango and django -Stefano Zacchiroli debcontrol and debchangelog +Stefano Zacchiroli debcontrol, debchangelog, mkd Alex Tarkovsky ebuild and eclass Jorge Rodrigues gams Rainer M??ller Objective C @@ -1190,11 +1209,17 @@ Bruce Sherrod velocity timberke cobol Aaron Schaefer factor -Laurent ARNOUD asterisk +Laurent ARNOUD asterisk, mplayerconf Kuchma Michael plsql Brett Warneke spectre Pipp lhaskell Renald Buter scala Vladimir Lomov asymptote Marco mrxvtrc, aap -nicothakis SVNAnnotate, CVSAnnotate, SVKAnnotate +nicothakis SVNAnnotate, CVSAnnotate, SVKAnnotate, + SVNdiff, gitAnnotate, gitdiff +Chen Xing Wikipedia +Jacobo Diaz dakota, patran +Li Jin gentoo-env-d, gentoo-init-d, + gentoo-make-conf, grub, modconf, sudoers + Modified: trunk/packages/vim-scripts/html/index.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1242&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/index.html (original) +++ trunk/packages/vim-scripts/html/index.html Tue Apr 8 20:27:44 2008 @@ -49,7 +49,7 @@

  • syntax/mkd.vim.html
  • - Page generated on Tue, 08 Apr 2008 16:15:47 -0400 + Page generated on Tue, 08 Apr 2008 16:25:59 -0400 .

    Modified: trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html?rev=1242&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html (original) +++ trunk/packages/vim-scripts/html/plugin_NERD_commenter.vim.html Tue Apr 8 20:27:44 2008 @@ -153,8 +153,8 @@  script karma  - Rating 618/208, - Downloaded by 9081 + Rating 681/226, + Downloaded by 10063

    @@ -204,28 +204,44 @@ release notes - NERD_commenter.zip - 2.1.9 - 2008-01-18 + NERD_commenter.zip + 2.1.12 + 2008-03-30 7.0 Marty Grenfell - - added support for mrxvtrc and aap, thx to Marco for the emails
    - added dummy support for SVNAnnotate, SVKAnnotate and CVSAnnotate, thx to nicothakis for posting the issue
    - - - NERD_commenter.zip - 2.1.8 - 2007-12-13 + - added support for patran and dakota, thx to Jacobo Diaz for the email
    - added support for gentoo-env-d, gentoo-init-d, gentoo-make-conf, grub, modconf and sudoers filetypes, thx to Li Jin for the patch.
    - added support for SVNdiff, gitAnnotate, gitdiff. Thx to nicothakis for posting the issue
    + + + NERD_commenter.zip + 2.1.11 + 2008-02-23 7.0 Marty Grenfell - - fixed a couple of bugs with the NERDSpaceDelims option, thx to David Miani and Jeremy Hinegardner
    - added dummy support for lhaskell, thx to pipp for posting the issue
    - added an alternative set of delims for the plsql filetype, thx to Kuchma Michael
    - added support for spectre, thx to Brett Warneke
    - added support for scala, thx to Renald Buter
    - added support for asymptote, thx to Vladimir Lomov
    - made NERDDefaultNesting enabled by default as this seems more intuitive, thx to marco for the suggestion
    - - - NERD_commenter.zip - 2.1.7 - 2007-12-01 + - fixed a bug with the selection option and visual commenting (again).  Thanks to Ingo Karkat (again).
    + + + NERD_commenter.zip + 2.1.10 + 2008-02-22 7.0 Marty Grenfell - - added support for haml, thx to Greb Weber
    - added support for asterisk, thx to Laurent ARNOUD
    - added support for objcpp, thx to Nicolas Weber
    - added support for the factor filetype, thx to Aaron Schaefer
    - fixed a bug with the passwd filetype setup, thx to Yongwei Wu
    - fixed a bug that was forcing filetypes with an alternative set of delims
      to have at least one multipart set.
    - split out the help file out from the script and repackaged everything as
      a zip
    + - added support for Wikipedia (thanks to Chen Xing)
    - added support for mplayerconf
    - bugfixes (thanks to Ingo Karkat for the bug report/patch)
    - added support for mkd (thanks to Stefano Zacchiroli)
    + + + NERD_commenter.zip + 2.1.9 + 2008-01-18 + 7.0 + Marty Grenfell + - added support for mrxvtrc and aap, thx to Marco for the emails
    - added dummy support for SVNAnnotate, SVKAnnotate and CVSAnnotate, thx to nicothakis for posting the issue
    + + + NERD_commenter.zip + 2.1.8 + 2007-12-13 + 7.0 + Marty Grenfell + - fixed a couple of bugs with the NERDSpaceDelims option, thx to David Miani and Jeremy Hinegardner
    - added dummy support for lhaskell, thx to pipp for posting the issue
    - added an alternative set of delims for the plsql filetype, thx to Kuchma Michael
    - added support for spectre, thx to Brett Warneke
    - added support for scala, thx to Renald Buter
    - added support for asymptote, thx to Vladimir Lomov
    - made NERDDefaultNesting enabled by default as this seems more intuitive, thx to marco for the suggestion
    NERD_commenter.vim @@ -967,8 +983,7 @@ - Sponsored by Web Concept Group Inc. - SourceForge.net Logo + SourceForge.net Logo Modified: trunk/packages/vim-scripts/plugin/NERD_commenter.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/NERD_commenter.vim?rev=1242&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/NERD_commenter.vim (original) +++ trunk/packages/vim-scripts/plugin/NERD_commenter.vim Tue Apr 8 20:27:44 2008 @@ -1,7 +1,7 @@ " vim global plugin that provides easy code commenting for various file types -" Last Change: 18 jan 2008 +" Last Change: 31 March 2008 " Maintainer: Martin Grenfell -let s:NERD_commenter_version = 2.1.9 +let s:NERD_commenter_version = 2.1.12 " For help documentation type :help NERDCommenter. If this fails, Restart vim " and try again. If it sill doesnt work... the help page is at the bottom @@ -256,6 +256,8 @@ call s:MapDelimitersWithAlternative('//','', '/*','*/') elseif a:filetype == "dcl" call s:MapDelimiters('$!', '') + elseif a:filetype == "dakota" + call s:MapDelimiters('#', '') elseif a:filetype == "debchangelog" call s:MapDelimiters('', '') elseif a:filetype == "debcontrol" @@ -342,16 +344,28 @@ call s:MapDelimiters('GEEK_COMMENT:', '') elseif a:filetype == "gentoo-conf-d" call s:MapDelimiters('#', '') + elseif a:filetype == "gentoo-env-d" + call s:MapDelimiters('#', '') + elseif a:filetype == "gentoo-init-d" + call s:MapDelimiters('#', '') + elseif a:filetype == "gentoo-make-conf" + call s:MapDelimiters('#', '') elseif a:filetype == 'gentoo-package-keywords' call s:MapDelimiters('#', '') elseif a:filetype == 'gentoo-package-mask' call s:MapDelimiters('#', '') elseif a:filetype == 'gentoo-package-use' call s:MapDelimiters('#', '') + elseif a:filetype == 'gitAnnotate' + call s:MapDelimiters('', '') + elseif a:filetype == 'gitdiff' + call s:MapDelimiters('', '') elseif a:filetype == "gnuplot" call s:MapDelimiters('#','') elseif a:filetype == "groovy" call s:MapDelimitersWithAlternative('//','', '/*','*/') + elseif a:filetype == "grub" + call s:MapDelimiters('#', '') elseif a:filetype == "gtkrc" call s:MapDelimiters('#', '') elseif a:filetype == "haskell" @@ -474,8 +488,12 @@ call s:MapDelimiters('%', '') elseif a:filetype == "mib" call s:MapDelimiters('--', '') + elseif a:filetype == "mkd" + call s:MapDelimiters('>', '') elseif a:filetype == "mma" call s:MapDelimiters('(*','*)') + elseif a:filetype == "modconf" + call s:MapDelimiters('#', '') elseif a:filetype == "model" call s:MapDelimiters('$','$') elseif a:filetype =~ "moduala." @@ -486,6 +504,8 @@ call s:MapDelimiters('(*','*)') elseif a:filetype == "monk" call s:MapDelimiters(';', '') + elseif a:filetype == "mplayerconf" + call s:MapDelimiters('#', '') elseif a:filetype == "mrxvtrc" call s:MapDelimiters('#', '') elseif a:filetype == "mush" @@ -538,6 +558,8 @@ call s:MapDelimitersWithAlternative('{','}', '(*', '*)') elseif a:filetype == "passwd" call s:MapDelimiters('','') + elseif a:filetype == "patran" + call s:MapDelimitersWithAlternative('$','','/*', '*/') elseif a:filetype == "pcap" call s:MapDelimiters('#', '') elseif a:filetype == "pccts" @@ -708,6 +730,8 @@ call s:MapDelimiters('--', '') elseif a:filetype == "strace" call s:MapDelimiters('/*','*/') + elseif a:filetype == "sudoers" + call s:MapDelimiters('#', '') elseif a:filetype == "SVKAnnotate" call s:MapDelimiters('','') elseif a:filetype == "svn" @@ -715,6 +739,8 @@ elseif a:filetype == "SVNAnnotate" call s:MapDelimiters('','') elseif a:filetype == "SVNcommitlog" + call s:MapDelimiters('','') + elseif a:filetype == "SVNdiff" call s:MapDelimiters('','') elseif a:filetype == "systemverilog" call s:MapDelimitersWithAlternative('//','', '/*','*/') @@ -790,6 +816,8 @@ call s:MapDelimiters('##', '') elseif a:filetype == "wget" call s:MapDelimiters('#', '') + elseif a:filetype ==? "Wikipedia" + call s:MapDelimiters('') elseif a:filetype == "winbatch" call s:MapDelimiters(';', '') elseif a:filetype == "wml" @@ -1041,7 +1069,7 @@ if s:Multipart() "stick the right delimiter down - let theLine = strpart(theLine, 0, rSide+strlen(leftSpaced)) . rightSpaced . strpart(theLine, rSide+strlen(rightSpaced)) + let theLine = strpart(theLine, 0, rSide+strlen(leftSpaced)) . rightSpaced . strpart(theLine, rSide+strlen(leftSpaced)) let firstLeftDelim = s:FindDelimiterIndex(b:left, theLine) let lastRightDelim = s:LastIndexOfDelim(b:right, theLine) @@ -1440,14 +1468,14 @@ " 'nested', 'toEOL', 'prepend', 'append', 'insert', 'uncomment', 'yank' function! NERDComment(isVisual, type) range " we want case sensitivity when commenting - let prevIgnoreCase = &ignorecase + let oldIgnoreCase = &ignorecase set noignorecase if a:isVisual let firstLine = line("'<") let lastLine = line("'>") let firstCol = col("'<") - let lastCol = col("'>") + let lastCol = col("'>") - (&selection == 'exclusive' ? 1 : 0) else let firstLine = a:firstline let lastLine = a:lastline @@ -1529,7 +1557,7 @@ execute firstLine .','. lastLine .'call NERDComment('. a:isVisual .', "norm")' endif - let &ignorecase = prevIgnoreCase + let &ignorecase = oldIgnoreCase endfunction " Function: s:PlaceDelimitersAndInsBetween() function {{{2 From jamessan at users.alioth.debian.org Tue Apr 8 20:43:24 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 20:43:24 -0000 Subject: r1243 - in /trunk/packages/vim-scripts: ./ debian/ doc/ ftplugin/ html/ plugin/ Message-ID: Author: jamessan Date: Tue Apr 8 20:43:24 2008 New Revision: 1243 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1243 Log: Update Enhanced Commentify Added: trunk/packages/vim-scripts/LICENSE.EnhancedCommentify trunk/packages/vim-scripts/ftplugin/ocaml_enhcomm.vim trunk/packages/vim-scripts/ftplugin/php_enhcomm.vim Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/doc/EnhancedCommentify.txt trunk/packages/vim-scripts/html/index.html trunk/packages/vim-scripts/html/plugin_EnhancedCommentify.vim.html trunk/packages/vim-scripts/plugin/EnhancedCommentify.vim Added: trunk/packages/vim-scripts/LICENSE.EnhancedCommentify URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/LICENSE.EnhancedCommentify?rev=1243&op=file ============================================================================== --- trunk/packages/vim-scripts/LICENSE.EnhancedCommentify (added) +++ trunk/packages/vim-scripts/LICENSE.EnhancedCommentify Tue Apr 8 20:43:24 2008 @@ -1,0 +1,24 @@ +Copyright (c) 2008 Meikel Brandmeyer, Frankfurt am Main +All rights reserved. + +Redistribution and use in source and binary form are permitted provided +that the following conditions are met: + +1. Redistribition of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1243&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Tue Apr 8 20:43:24 2008 @@ -7,10 +7,10 @@ being run in other buffers. Thanks to Marvin Renich for the patch fix. (Closes: #465330) * Updated addons: - - xmledit, surround, debPlugin, Markdown syntax, NERD Commenter + - xmledit, surround, debPlugin, Markdown syntax, NERD Commenter, Enhanced + Commentify. * New addons: - DetectIndent: Automatically detect indent settings (Closes: #471890) - * -- James Vega Tue, 05 Feb 2008 17:06:54 -0500 Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1243&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr 8 20:43:24 2008 @@ -171,10 +171,10 @@ author: Meikel Brandmeyer author_url: http://www.vim.org/account/profile.php?user_id=62 email: Brandels_Mikesh at web.de -license: BSD, see /usr/share/common-licenses/BSD -extras: doc/EnhancedCommentify.txt +license: license [5], see below +extras: doc/EnhancedCommentify.txt, ftplugin/php_enhcomm.vim, ftplugin/ocaml_enhcomm.vim, LICENSE.EnhancedCommentify disabledby: let DidEnhancedCommentify = 1 -version: 2.2 +version: 2.3 script_name: ftplugin/xml.vim addon: xmledit @@ -505,3 +505,26 @@ sources, parts of it or from a modified version. You may use this license for previous Vim releases instead of the license that they came with, at your option. + +license [5] + Redistribution and use in source and binary form are permitted provided + that the following conditions are met: + + 1. Redistribition of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. Modified: trunk/packages/vim-scripts/doc/EnhancedCommentify.txt URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/doc/EnhancedCommentify.txt?rev=1243&op=diff ============================================================================== --- trunk/packages/vim-scripts/doc/EnhancedCommentify.txt (original) +++ trunk/packages/vim-scripts/doc/EnhancedCommentify.txt Tue Apr 8 20:43:24 2008 @@ -304,27 +304,38 @@ 3. Adding new languages *EnhComm-NewLanguages* -Adding new languages is really easy. Just follow this step-by-step -process. Assume we want to add the language Foobar. It uses multipart -comments like C ("/*" <=> "bar", "*/" <=> "baz") and has the filetype -"foo". +Since 2.3 there is the possibility to use some callback function to +handle unrecognised filetypes. This is a substitute to steps a)-d) +below. Just add a function called "EnhCommentifyCallback" and set +"g:EnhCommentifyCallbackExists" to some value. > + function EnhCommentifyCallback(ft) + if a:ft == 'foo' + let b:ECcommentOpen = 'bar' + let b:ECcommentClose = 'baz' + endif + endfunction + let g:EnhCommentifyCallbackExists = 'Yes' +< +Optionally the steps e) and f) still apply. + +Of course the old way still works: a) Open the script. b) Go to the GetFileTypeSettings() function. c) Now you should see the large "if"-tree. > if fileType =~ '^\(c\|css\|...' - let b:EnhCommentifyCommentOpen = '/*' - let b:EnhCommentifyCommentClose = '*/' + let b:ECcommentOpen = '/*' + let b:ECcommentClose = '*/' elseif ... < d) There are two buffer-local variables, which hold the different comment - strings. With this in mind we add Foobar: > + strings. > if fileType =~ '^\(c\|css\|...' - let b:EnhCommentifyCommentOpen = '/*' - let b:EnhCommentifyCommentClose = '*/' + let b:ECcommentOpen = '/*' + let b:ECcommentClose = '*/' elseif fileType == 'foo' - let b:EnhCommentifyCommentOpen = 'bar' - let b:EnhCommentifyCommentClose = 'baz' + let b:ECcommentOpen = 'bar' + let b:ECcommentClose = 'baz' elseif ... < If the new language has only one comment string (like '#' in Perl), we @@ -447,6 +458,13 @@ - John Orr - Luc Hermite - Brett Calcott + - Ben Kibbey + - Brian Neu + - Steve Hall + - Zhang Le + - Pieter Naaijkens + - Thomas Link + - Stefano Zacchiroli Thanks to John Orr and Xiangjiang Ma for their rich feedback and to Luc Hermite for some good improvement suggestions. Added: trunk/packages/vim-scripts/ftplugin/ocaml_enhcomm.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/ftplugin/ocaml_enhcomm.vim?rev=1243&op=file ============================================================================== --- trunk/packages/vim-scripts/ftplugin/ocaml_enhcomm.vim (added) +++ trunk/packages/vim-scripts/ftplugin/ocaml_enhcomm.vim Tue Apr 8 20:43:24 2008 @@ -1,0 +1,1 @@ +set commentstring=(*%s*) Added: trunk/packages/vim-scripts/ftplugin/php_enhcomm.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/ftplugin/php_enhcomm.vim?rev=1243&op=file ============================================================================== --- trunk/packages/vim-scripts/ftplugin/php_enhcomm.vim (added) +++ trunk/packages/vim-scripts/ftplugin/php_enhcomm.vim Tue Apr 8 20:43:24 2008 @@ -1,0 +1,6 @@ +" +" Normal HTML text has no synID-name. So we have to specify this problem +" case here. Note that you should not try to comment lines starting +" with 'syntax/mkd.vim.html

    - Page generated on Tue, 08 Apr 2008 16:25:59 -0400 + Page generated on Tue, 08 Apr 2008 16:41:46 -0400 .

    Modified: trunk/packages/vim-scripts/html/plugin_EnhancedCommentify.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_EnhancedCommentify.vim.html?rev=1243&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/plugin_EnhancedCommentify.vim.html (original) +++ trunk/packages/vim-scripts/html/plugin_EnhancedCommentify.vim.html Tue Apr 8 20:43:24 2008 @@ -153,8 +153,8 @@  script karma  - Rating 963/308, - Downloaded by 12865 + Rating 1069/338, + Downloaded by 13955

    @@ -167,7 +167,7 @@ utility   description -This script is strongly based on ToggleCommentify.vim (vimscript #4) of Vincent Nijs. I extended it with some nice features, but Vincent wants to keep his
    script simple. So, he suggest me to put my modifications to vim online by myself. Well, here we go:
    New features:
    * MultiPart-comment-strings are now possible (eg. /* */, <!-- -->)
    * MultiPart-comments inside comments are now escaped.
    * Supported languages: Vim, C, C++, PHP, Perl, ox, Tex, Sh, LISP, Python, HTML, XML, Java, JProperties, CAOS, CSS a. o.
    * length of comment-strings is computed dynamically
    * comment strings are escaped to prevent problems with regular expressions
    * option to turn "commentification" of empty lines on or off
    * commentifies multiple lines in visual mode +The development of the script is done at http://ec.kotka.de. Releases may be downloaded from below.

    There is a major rework for Vim7 underway. In case you are missing any features, this is the time to suggest them. Send me an email or report your bugs or suggestions in the trac at the link above. This is a serious request from me to the users. In the past a lof of people complained on mailing lists, that "this doesn't work" or "that feature is missing", without contacting me. If you don't tell the upstream author, then this won't change!

    Stay tuned.   install details Simply drop the script in your .vim/plugin directory. There is a detailed EnhancedCommentify.txt, since there are to much options to explain here. Put it in your .vim/doc directory and issue the ':helptags ~/.vim/doc' command. ':help EnhancedCommentify' should then give you any information you need in order to use the new features of the script.                                                                                 @@ -204,28 +204,36 @@ release notes - EnhancedCommentify-2.2.tar.gz - 2.2 - 2004-09-27 + EnhancedCommentify-2.3.tar.gz + 2.3 + 2008-02-21 6.0 Meikel Brandmeyer - New features:
    * Keybindings may be turned off in the different modes. (eg. no bindings in insert mode)
    * Keybindings may be local to the buffer now.
    * Keybindings may be turned off in case of an unknown filetype.

    Bugfixes:
    * Fixed a problem with UseSyntax. (thanks to Pieter Naaijkens)
    * Fixed Ocaml support. (thanks to Zhang Le) - - - EnhancedCommentify-2.1.tar.gz - 2.1 - 2004-01-26 + Still alive! Yeah! :-D

    Finally a new release....

    This is mainly a bugfix release:
    * Fixed a typo in the apache detection. (thanks to Brian Neu)
    * Fixed handling of nested comment escape strings. (thanks to Samuel Ferencik)
    * Fixed broken keyboard mappings when wcm is set to <Tab>. (thanks to xpatriotx)

    * Added support for viki & deplate (thanks to Thomas Link)
    * Added support xslt, xsd & mail (thanks to Stefano Zacchiroli)
    * Added callback-functionality to enable extension of the script without actually modifying the script.
    + + + EnhancedCommentify-2.2.tar.gz + 2.2 + 2004-09-27 6.0 Meikel Brandmeyer - This is version 2.1 of the EnhancedCommentify Script.
    New features:
    * one-block commenting for multipart comments
    * if possible, use commentstring option in order to determine the comment strings.
    * moved autocmd to BufWinEnter in order to fix modeline usage
    * experimental parsing of comments option to find out middle string for new one-block feature.

    Bugfixes:
    * fixed problems with tabs if align-right option is used
    * fixed case sensitive check for overrideEL (thanks to Steve Hall)
    * fixed problems with javascript filetype (thanks to Brian Neu)
    * changed init-autocmd to BufWinEnter to fix usage of modeline
    - - - EnhancedCommentify-2.0.tar.gz - 2.0 - 2002-09-11 + New features:
    * Keybindings may be turned off in the different modes. (eg. no bindings in insert mode)
    * Keybindings may be local to the buffer now.
    * Keybindings may be turned off in case of an unknown filetype.

    Bugfixes:
    * Fixed a problem with UseSyntax. (thanks to Pieter Naaijkens)
    * Fixed Ocaml support. (thanks to Zhang Le) + + + EnhancedCommentify-2.1.tar.gz + 2.1 + 2004-01-26 6.0 Meikel Brandmeyer - Version 2.0 is finally out. With a whole bunch of changes. Most important:
    The script is now released under BSD license. But this should be no restriction I think.
    Bugfixes:
    * ''' is an invalid expression (thanks to Zak Beck)
    * AltOpen/Close set to '' could cause problems (thanks to Ben Kibbey)
    * bug in keybinding code (thanks to Charles Campbell)
    * trouble with 'C' in cpo (thanks to Luc Hermitte)
    New features:
    * produces now block comments, eg:
        /*int a;
        char b;*/
    * option to add ident string only at opener
    * options may now be set on a per buffer basis.

    I can only recommend (again!) to read the help file for new options and explanations for old ones.
    This release contains script und helpfile in a tar.gz.
    + This is version 2.1 of the EnhancedCommentify Script.
    New features:
    * one-block commenting for multipart comments
    * if possible, use commentstring option in order to determine the comment strings.
    * moved autocmd to BufWinEnter in order to fix modeline usage
    * experimental parsing of comments option to find out middle string for new one-block feature.

    Bugfixes:
    * fixed problems with tabs if align-right option is used
    * fixed case sensitive check for overrideEL (thanks to Steve Hall)
    * fixed problems with javascript filetype (thanks to Brian Neu)
    * changed init-autocmd to BufWinEnter to fix usage of modeline
    + + + EnhancedCommentify-2.0.tar.gz + 2.0 + 2002-09-11 + 6.0 + Meikel Brandmeyer + Version 2.0 is finally out. With a whole bunch of changes. Most important:
    The script is now released under BSD license. But this should be no restriction I think.
    Bugfixes:
    * ''' is an invalid expression (thanks to Zak Beck)
    * AltOpen/Close set to '' could cause problems (thanks to Ben Kibbey)
    * bug in keybinding code (thanks to Charles Campbell)
    * trouble with 'C' in cpo (thanks to Luc Hermitte)
    New features:
    * produces now block comments, eg:
        /*int a;
        char b;*/
    * option to add ident string only at opener
    * options may now be set on a per buffer basis.

    I can only recommend (again!) to read the help file for new options and explanations for old ones.
    This release contains script und helpfile in a tar.gz.
    @@ -271,8 +279,7 @@ - Sponsored by Web Concept Group Inc. - SourceForge.net Logo + SourceForge.net Logo Modified: trunk/packages/vim-scripts/plugin/EnhancedCommentify.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/EnhancedCommentify.vim?rev=1243&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/EnhancedCommentify.vim (original) +++ trunk/packages/vim-scripts/plugin/EnhancedCommentify.vim Tue Apr 8 20:43:24 2008 @@ -1,34 +1,33 @@ " EnhancedCommentify.vim " Maintainer: Meikel Brandmeyer -" Version: 2.2 -" Last Change: Monday, 27th September 2004 +" Version: 2.3 +" Last Change: Wednesday, February 20th, 2008 " License: -" Copyright (c) 2002,2003,2004 Meikel Brandmeyer, Kaiserslautern. +" Copyright (c) 2008 Meikel Brandmeyer, Frankfurt am Main " All rights reserved. -" -" Redistribution and use in source and binary forms, with or without -" modification, are permitted provided that the following conditions are met: -" -" * Redistributions of source code must retain the above copyright notice, -" this list of conditions and the following disclaimer. -" * Redistributions in binary form must reproduce the above copyright notice, -" this list of conditions and the following disclaimer in the documentation -" and/or other materials provided with the distribution. -" * Neither the name of the author nor the names of its contributors may be -" used to endorse or promote products derived from this software without -" specific prior written permission. -" -" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -" DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +" +" Redistribution and use in source and binary form are permitted provided +" that the following conditions are met: +" +" 1. Redistribition of source code must retain the above copyright +" notice, this list of conditions and the following disclaimer. +" +" 2. Redistributions in binary form must reproduce the above copyright +" notice, this list of conditions and the following disclaimer in the +" documentation and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS "AS IS" AND +" ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE " FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +" SUCH DAMAGE. " Description: " This is a (well... more or less) simple script to comment lines in a program. @@ -36,6 +35,11 @@ " language, python, HTML, Perl, LISP, Tex, Shell, CAOS and others. " Bugfixes: +" 2.3 +" Fixed type 'apacha' -> 'apache' (thanks to Brian Neu) +" Fixed nested comment escapes strings. (thanks to Samuel Ferencik) +" Fixed broken keyboard mappings when wcm was set to . +" (thanks to xpatriotx) " 2.2 " Fixed problem with UseSyntax (thanks to Pieter Naaijkens) " Fixed typo in ParseCommentsOp (commstr -> commStr). @@ -63,6 +67,11 @@ " made function silent (thanks to Mare Ellen Foster) " Changelog: +" 2.3 +" Added support for viki/deplate (thanks to Thomas Link) +" Added support for xslt/xsd/mail (thanks to Stefano Zacchiroli) +" Added callback-functionality to enable extensions without the +" need of modification directly in the script. " 2.2 " Added possibility to override the modes, in which keybindings are " defined. @@ -153,7 +162,7 @@ let {a:scriptVar} = a:defaultVal endif endfunction - + " " InitStringVariable(confVar, scriptVar, defaultVal) " confVar -- name of the configuration variable @@ -407,7 +416,7 @@ function EnhancedCommentifyInitBuffer() if !exists("b:ECdidBufferInit") call s:InitScriptVariables("b") - + if !exists("b:EnhCommentifyFallbackTest") let b:EnhCommentifyFallbackTest = 0 endif @@ -589,7 +598,7 @@ let i = a:start let len = 0 let amount = 100000 " this should be enough ... - + while i <= a:end if b:ECuseBlockIndent && getline(i) !~ '^\s*$' let cur = indent(i) @@ -611,7 +620,7 @@ let len = cur endif endif - + let i = i + 1 endwhile @@ -660,7 +669,7 @@ let ft = &ft endif endif - + " Nothing changed! if ft == b:ECsyntax return @@ -679,6 +688,20 @@ " function s:GetFileTypeSettings(ft) let fileType = a:ft + + " If we find nothing appropriate this is the default. + let b:ECcommentOpen = '' + let b:ECcommentClose = '' + + if exists("g:EnhCommentifyCallbackExists") + call EnhCommentifyCallback(fileType) + + " Check whether the callback did yield a result. + " If so we use it. The user nows, what he's doing. + if b:ECcommentOpen != '' + return + endif + endif " I learned about the commentstring option. Let's use it. " For now we ignore it, if it is "/*%s*/". This is the @@ -696,7 +719,7 @@ \ 'strace\|xpm\|yacc\)$' let b:ECcommentOpen = '/*' let b:ECcommentClose = '*/' - elseif fileType =~ '^\(html\|xml\|dtd\|sgmllnx\)$' + elseif fileType =~ '^\(html\|xhtml\|xml\|xslt\|xsd\|dtd\|sgmllnx\)$' let b:ECcommentOpen = '' elseif fileType =~ '^\(sgml\|smil\)$' @@ -749,7 +772,7 @@ let b:ECcommentOpen = ';' let b:ECcommentClose = '' elseif fileType =~ '^\(python\|perl\|[^w]*sh$\|tcl\|jproperties\|make\|'. - \ 'robots\|apacha\|apachestyle\|awk\|bc\|cfg\|cl\|conf\|'. + \ 'robots\|apache\|apachestyle\|awk\|bc\|cfg\|cl\|conf\|'. \ 'crontab\|diff\|ecd\|elmfilt\|eterm\|expect\|exports\|'. \ 'fgl\|fvwm\|gdb\|gnuplot\|gtkrc\|hb\|hog\|ia64\|icon\|'. \ 'inittab\|lftp\|lilo\|lout\|lss\|lynx\|maple\|mush\|'. @@ -771,7 +794,7 @@ let b:ECcommentClose = '' elseif fileType =~ '^\(tex\|abc\|erlang\|ist\|lprolog\|matlab\|mf\|'. \ 'postscr\|ppd\|prolog\|simula\|slang\|slrnrc\|slrnsc\|'. - \ 'texmf\|virata\)$' + \ 'texmf\|viki\|virata\)$' let b:ECcommentOpen = '%' let b:ECcommentClose = '' elseif fileType =~ '^\(caos\|cterm\|form\|foxpro\|sicad\|snobol4\)$' @@ -834,8 +857,8 @@ elseif fileType == 'texinfo' let b:ECcommentOpen = '@c ' let b:ECcommentClose = '' - else - let b:ECcommentOpen = '' + elseif fileType == 'mail' + let b:ECcommentOpen = '>' let b:ECcommentClose = '' endif @@ -1116,13 +1139,18 @@ function s:UnEscape(lineString, commentStart, commentEnd) let line = a:lineString + " We translate only the first and the last occurrence + " of this resp. escape string. Commenting a line several + " times and decommenting it again breaks things. if b:ECaltOpen != '' let line = substitute(line, s:EscapeString(b:ECaltOpen), - \ a:commentStart, "g") + \ a:commentStart, "") endif if b:ECaltClose != '' - let line = substitute(line, s:EscapeString(b:ECaltClose), - \ a:commentEnd, "g") + let esAltClose = s:EscapeString(b:ECaltClose) + let line = substitute(line, esAltClose + \ . "\\(.*" . esAltClose . "\\)\\@!", + \ a:commentEnd, "") endif return line @@ -1154,7 +1182,7 @@ let line = substitute(line, s:LookFor('commentmiddle'), \ s:SubstituteWith('commentmiddle', a:2), "") endif - + if !b:ECuseMPBlock || (b:ECuseMPBlock && s:i == s:endBlock) " Align the closing part to the right. if b:ECalignRight && s:inBlock @@ -1170,13 +1198,13 @@ \ s:SubstituteWith('commentend', a:1), "") endif endif - + " insert the comment symbol if !b:ECuseMPBlock || a:0 == 0 || (b:ECuseMPBlock && s:i == s:startBlock) let line = substitute(line, s:LookFor('commentstart'), \ s:SubstituteWith('commentstart', a:commentSymbol), "") endif - + return line endfunction @@ -1238,7 +1266,7 @@ function s:GetLineLen(line, offset) let len = a:offset let i = 0 - + while a:line[i] != "" if a:line[i] == "\t" let len = (((len / &tabstop) + 1) * &tabstop) @@ -1250,7 +1278,7 @@ return len endfunction - + " " EscapeString(string) " string -- string to process @@ -1284,7 +1312,7 @@ else let handleWhitespace = b:ECsaveWhite endif - + if a:what == 'checkstart' let regex = '^'. b:ECsaveWhite . s:EscapeString(a:1) \ . s:EscapeString(b:ECidentFront) @@ -1337,7 +1365,7 @@ let handleWhitespace = b:ECrespectWhite . commentSymbol \ . b:ECignoreWhite endif - + if a:what == 'commentstart' let regex = handleWhitespace . b:ECidentFront \ . b:ECprettyComments @@ -1467,16 +1495,16 @@ noremap VisualComment \ :call EnhancedCommentify('', 'comment', - \ line("'<"), line("'>")) + \ line("'<"), line("'>")) noremap VisualDeComment \ :call EnhancedCommentify('', 'decomment', - \ line("'<"), line("'>")) + \ line("'<"), line("'>")) noremap VisualTraditional \ :call EnhancedCommentify('', 'guess', - \ line("'<"), line("'>")) + \ line("'<"), line("'>")) noremap VisualFirstLine \ :call EnhancedCommentify('', 'first', - \ line("'<"), line("'>")) + \ line("'<"), line("'>")) " " Finally set keybindings. " From jamessan at users.alioth.debian.org Tue Apr 8 21:07:01 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 21:07:01 -0000 Subject: r1244 - in /trunk/packages/vim-scripts: ./ debian/ doc/ html/ plugin/ syntax/ Message-ID: Author: jamessan Date: Tue Apr 8 21:07:01 2008 New Revision: 1244 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1244 Log: Update vcscommand Removed: trunk/packages/vim-scripts/CHANGES.CVSCommand.txt Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/doc/vcscommand.txt trunk/packages/vim-scripts/html/index.html trunk/packages/vim-scripts/html/plugin_vcscommand.vim.html trunk/packages/vim-scripts/plugin/vcscommand.vim trunk/packages/vim-scripts/plugin/vcscvs.vim trunk/packages/vim-scripts/plugin/vcsgit.vim trunk/packages/vim-scripts/plugin/vcssvk.vim trunk/packages/vim-scripts/plugin/vcssvn.vim trunk/packages/vim-scripts/syntax/CVSAnnotate.vim trunk/packages/vim-scripts/syntax/SVKAnnotate.vim trunk/packages/vim-scripts/syntax/SVNAnnotate.vim trunk/packages/vim-scripts/syntax/vcscommit.vim Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Tue Apr 8 21:07:01 2008 @@ -8,9 +8,9 @@ (Closes: #465330) * Updated addons: - xmledit, surround, debPlugin, Markdown syntax, NERD Commenter, Enhanced - Commentify. + Commentify, vcscommand. * New addons: - - DetectIndent: Automatically detect indent settings (Closes: #471890) + - DetectIndent: Automatically detect indent settings. (Closes: #471890) -- James Vega Tue, 05 Feb 2008 17:06:54 -0500 Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr 8 21:07:01 2008 @@ -139,7 +139,7 @@ license: public domain extras: doc/vcscommand.txt, plugin/vcscvs.vim, plugin/vcsgit.vim, plugin/vcssvn.vim, plugin/vcssvk.vim, syntax/CVSAnnotate.vim, syntax/SVNAnnotate.vim, syntax/SVKAnnotate.vim, syntax/vcscommit.vim disabledby: let loaded_VCSCommand = 1 -version: beta20 +version: beta22 script_name: plugin/utl.vim addon: utl @@ -172,7 +172,7 @@ author_url: http://www.vim.org/account/profile.php?user_id=62 email: Brandels_Mikesh at web.de license: license [5], see below -extras: doc/EnhancedCommentify.txt, ftplugin/php_enhcomm.vim, ftplugin/ocaml_enhcomm.vim, LICENSE.EnhancedCommentify +extras: doc/EnhancedCommentify.txt, ftplugin/php_enhcomm.vim, ftplugin/ocaml_enhcomm.vim disabledby: let DidEnhancedCommentify = 1 version: 2.3 Modified: trunk/packages/vim-scripts/doc/vcscommand.txt URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/doc/vcscommand.txt?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/doc/vcscommand.txt (original) +++ trunk/packages/vim-scripts/doc/vcscommand.txt Tue Apr 8 21:07:01 2008 @@ -34,6 +34,7 @@ vcscommand Manual : |vcscommand-manual| Customization : |vcscommand-customize| SSH "integration" : |vcscommand-ssh| + Changes from cvscommand : |cvscommand-changes| Bugs : |vcscommand-bugs| ============================================================================== @@ -711,7 +712,48 @@ ============================================================================== -7. Known bugs *vcscommand-bugs* +7. Changes from cvscommandi *cvscommand-changes* + +1. Require Vim 7 in order to leverage several convenient features; also +because I wanted to play with Vim 7. + +2. Renamed commands to start with 'VCS' instead of 'CVS'. The exceptions are +the 'CVSEdit' and 'CVSWatch' family of commands, which are specific to CVS. + +3. Renamed options, events to start with 'VCSCommand'. + +4. Removed option to jump to the parent version of the current line in an +annotated buffer, as opposed to the version on the current line. This made +little sense in the branching scheme used by subversion, where jumping to a +parent branch required finding a different location in the repository. It +didn't work consistently in CVS anyway. + +5. Removed option to have nameless scratch buffers. + +6. Changed default behavior of scratch buffers to split the window instead of +displaying in the current window. This may still be overridden using the +'VCSCommandEdit' option. + +7. Split plugin into multiple plugins. + +8. Added 'VCSLock' and 'VCSUnlock' commands. These are implemented for +subversion but not for CVS. These were not kept specific to subversion as they +seemed more general in nature and more likely to be supported by any future VCS +supported by this plugin. + +9. Changed name of buffer variables set by commands. + +'b:cvsOrigBuffNR' became 'b:VCSCommandOriginalBuffer' +'b:cvscmd' became 'b:VCSCommandCommand' + +10. Added new automatic variables to command result buffers. + +'b:VCSCommandSourceFile' +'b:VCSCommandVCSType' + +============================================================================== + +8. Known bugs *vcscommand-bugs* Please let me know if you run across any. Modified: trunk/packages/vim-scripts/html/index.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/index.html (original) +++ trunk/packages/vim-scripts/html/index.html Tue Apr 8 21:07:01 2008 @@ -49,7 +49,7 @@

  • syntax/mkd.vim.html
  • - Page generated on Tue, 08 Apr 2008 16:41:46 -0400 + Page generated on Tue, 08 Apr 2008 16:51:55 -0400 .

    Modified: trunk/packages/vim-scripts/html/plugin_vcscommand.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_vcscommand.vim.html?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/plugin_vcscommand.vim.html (original) +++ trunk/packages/vim-scripts/html/plugin_vcscommand.vim.html Tue Apr 8 21:07:01 2008 @@ -153,8 +153,8 @@  script karma  - Rating 1301/428, - Downloaded by 19452 + Rating 1347/446, + Downloaded by 20420

    @@ -204,6 +204,22 @@ release notes + vcscommand.zip + beta22 + 2008-03-17 + 7.0 + Bob Hiestand + Added VCSCommandGitDescribeArgList option to control allowed modes of 'git describe' used in GetBufferInfo for git.  This is a comma-separated list of arguments to try against git-describe.  This is an attempt to have prioritized fallbacks of descriptions, and runs in order until it finds a valid description.  This value defaults to ',tags,all,always', and so first searches annotated tags, then tags, then all references, then a commit description. + + + vcscommand.zip + beta21 + 2008-03-11 + 7.0 + Bob Hiestand + Tweaked buffer info for git buffers.

    Don't clobber &cp when testing for a vcs command.

    Added 'options' Dict to VCSCommandDoCommand for tweaking framework behavior.

    Allow non-zero vcs command exit status when 'allowNonZeroExit' option is passed to VCSCommandDoCommand.

    Implemented VCSStatus for git as (repository-wide) 'git status'.

    Converted to leading tab style.

    Distinguish between exact and inexact identifications by extensions.

    Mark git identification as inexact, so that using another VCS to control directories somewhere under a git-controlled directory does not identify the files incorrectly as git.

    Moved CHANGES.txt content into help file.
    + + vcscommand.zip beta20 2008-02-01 @@ -503,8 +519,7 @@ - Sponsored by Web Concept Group Inc. - SourceForge.net Logo + SourceForge.net Logo Modified: trunk/packages/vim-scripts/plugin/vcscommand.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/vcscommand.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/vcscommand.vim (original) +++ trunk/packages/vim-scripts/plugin/vcscommand.vim Tue Apr 8 21:07:01 2008 @@ -2,7 +2,7 @@ " " Vim plugin to assist in working with files under control of CVS or SVN. " -" Version: Beta 20 +" Version: Beta 22 " Maintainer: Bob Hiestand " License: " Copyright (c) 2007 Bob Hiestand @@ -273,13 +273,13 @@ " system initialization. if exists('loaded_VCSCommand') - finish + finish endif let loaded_VCSCommand = 1 if v:version < 700 - echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None - finish + echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None + finish endif let s:save_cpo=&cpo @@ -296,14 +296,29 @@ " Section: Plugin initialization {{{1 silent do VCSCommand User VCSPluginInit +" Section: Constants declaration {{{1 + +let g:VCSCOMMAND_IDENTIFY_EXACT = 1 +let g:VCSCOMMAND_IDENTIFY_INEXACT = -1 + " Section: Script variable initialization {{{1 +" plugin-specific information: {vcs -> [script, {command -> function}, {key -> mapping}]} let s:plugins = {} + +" temporary values of overridden configuration variables let s:optionOverrides = {} + +" state flag used to vary behavior of certain automated actions let s:isEditFileRunning = 0 +" commands needed to restore diff buffers to their original state unlet! s:vimDiffRestoreCmd + +" original buffer currently reflected in vimdiff windows unlet! s:vimDiffSourceBuffer + +" unlet! s:vimDiffScratchList " Section: Utility functions {{{1 @@ -313,7 +328,7 @@ " invoked from a catch statement. function! s:ReportError(error) - echohl WarningMsg|echomsg 'VCSCommand: ' . a:error|echohl None + echohl WarningMsg|echomsg 'VCSCommand: ' . a:error|echohl None endfunction " Function: s:ExecuteExtensionMapping(mapping) {{{2 @@ -321,15 +336,15 @@ " current buffer. function! s:ExecuteExtensionMapping(mapping) - let buffer = bufnr('%') - let vcsType = VCSCommandGetVCSType(buffer) - if !has_key(s:plugins, vcsType) - throw 'Unknown VCS type: ' . vcsType - endif - if !has_key(s:plugins[vcsType][2], a:mapping) - throw 'This extended mapping is not defined for ' . vcsType - endif - silent execute 'normal' ':' . s:plugins[vcsType][2][a:mapping] . "\" + let buffer = bufnr('%') + let vcsType = VCSCommandGetVCSType(buffer) + if !has_key(s:plugins, vcsType) + throw 'Unknown VCS type: ' . vcsType + endif + if !has_key(s:plugins[vcsType][2], a:mapping) + throw 'This extended mapping is not defined for ' . vcsType + endif + silent execute 'normal' ':' . s:plugins[vcsType][2][a:mapping] . "\" endfunction " Function: s:ExecuteVCSCommand(command, argList) {{{2 @@ -338,35 +353,35 @@ " occurs. function! s:ExecuteVCSCommand(command, argList) - try - let buffer = bufnr('%') - - let vcsType = VCSCommandGetVCSType(buffer) - if !has_key(s:plugins, vcsType) - throw 'Unknown VCS type: ' . vcsType - endif - - let originalBuffer = VCSCommandGetOriginalBuffer(buffer) - let bufferName = bufname(originalBuffer) - - " It is already known that the directory is under VCS control. No further - " checks are needed. Otherwise, perform some basic sanity checks to avoid - " VCS-specific error messages from confusing things. - if !isdirectory(bufferName) - if !filereadable(bufferName) - throw 'No such file ' . bufferName - endif - endif - - let functionMap = s:plugins[vcsType][1] - if !has_key(functionMap, a:command) - throw 'Command ''' . a:command . ''' not implemented for ' . vcsType - endif - return functionMap[a:command](a:argList) - catch - call s:ReportError(v:exception) - return -1 - endtry + try + let buffer = bufnr('%') + + let vcsType = VCSCommandGetVCSType(buffer) + if !has_key(s:plugins, vcsType) + throw 'Unknown VCS type: ' . vcsType + endif + + let originalBuffer = VCSCommandGetOriginalBuffer(buffer) + let bufferName = bufname(originalBuffer) + + " It is already known that the directory is under VCS control. No further + " checks are needed. Otherwise, perform some basic sanity checks to avoid + " VCS-specific error messages from confusing things. + if !isdirectory(bufferName) + if !filereadable(bufferName) + throw 'No such file ' . bufferName + endif + endif + + let functionMap = s:plugins[vcsType][1] + if !has_key(functionMap, a:command) + throw 'Command ''' . a:command . ''' not implemented for ' . vcsType + endif + return functionMap[a:command](a:argList) + catch + call s:ReportError(v:exception) + return -1 + endtry endfunction " Function: s:GenerateResultBufferName(command, originalBuffer, vcsType, statusText) {{{2 @@ -374,19 +389,19 @@ " overridden with the VCSResultBufferNameFunction variable. function! s:GenerateResultBufferName(command, originalBuffer, vcsType, statusText) - let fileName = bufname(a:originalBuffer) - let bufferName = a:vcsType . ' ' . a:command - if strlen(a:statusText) > 0 - let bufferName .= ' ' . a:statusText - endif - let bufferName .= ' ' . fileName - let counter = 0 - let versionedBufferName = bufferName - while buflisted(versionedBufferName) - let counter += 1 - let versionedBufferName = bufferName . ' (' . counter . ')' - endwhile - return versionedBufferName + let fileName = bufname(a:originalBuffer) + let bufferName = a:vcsType . ' ' . a:command + if strlen(a:statusText) > 0 + let bufferName .= ' ' . a:statusText + endif + let bufferName .= ' ' . fileName + let counter = 0 + let versionedBufferName = bufferName + while buflisted(versionedBufferName) + let counter += 1 + let versionedBufferName = bufferName . ' (' . counter . ')' + endwhile + return versionedBufferName endfunction " Function: s:GenerateResultBufferNameWithExtension(command, originalBuffer, vcsType, statusText) {{{2 @@ -394,19 +409,19 @@ " file name with the VCS type and command appended as extensions. function! s:GenerateResultBufferNameWithExtension(command, originalBuffer, vcsType, statusText) - let fileName = bufname(a:originalBuffer) - let bufferName = a:vcsType . ' ' . a:command - if strlen(a:statusText) > 0 - let bufferName .= ' ' . a:statusText - endif - let bufferName .= ' ' . fileName . VCSCommandGetOption('VCSCommandResultBufferNameExtension', '.vcs') - let counter = 0 - let versionedBufferName = bufferName - while buflisted(versionedBufferName) - let counter += 1 - let versionedBufferName = '(' . counter . ') ' . bufferName - endwhile - return versionedBufferName + let fileName = bufname(a:originalBuffer) + let bufferName = a:vcsType . ' ' . a:command + if strlen(a:statusText) > 0 + let bufferName .= ' ' . a:statusText + endif + let bufferName .= ' ' . fileName . VCSCommandGetOption('VCSCommandResultBufferNameExtension', '.vcs') + let counter = 0 + let versionedBufferName = bufferName + while buflisted(versionedBufferName) + let counter += 1 + let versionedBufferName = '(' . counter . ') ' . bufferName + endwhile + return versionedBufferName endfunction " Function: s:EditFile(command, originalBuffer, statusText) {{{2 @@ -414,48 +429,48 @@ " original buffer. function! s:EditFile(command, originalBuffer, statusText) - let vcsType = getbufvar(a:originalBuffer, 'VCSCommandVCSType') - - let nameExtension = VCSCommandGetOption('VCSCommandResultBufferNameExtension', '') - if nameExtension == '' - let nameFunction = VCSCommandGetOption('VCSCommandResultBufferNameFunction', 's:GenerateResultBufferName') - else - let nameFunction = VCSCommandGetOption('VCSCommandResultBufferNameFunction', 's:GenerateResultBufferNameWithExtension') - endif - - let resultBufferName = call(nameFunction, [a:command, a:originalBuffer, vcsType, a:statusText]) - - " Protect against useless buffer set-up - let s:isEditFileRunning += 1 - try - let editCommand = VCSCommandGetOption('VCSCommandEdit', 'split') - if editCommand == 'split' - if VCSCommandGetOption('VCSCommandSplit', 'horizontal') == 'horizontal' - rightbelow split - else - vert rightbelow split - endif - endif - edit `=resultBufferName` - let b:VCSCommandCommand = a:command - let b:VCSCommandOriginalBuffer = a:originalBuffer - let b:VCSCommandSourceFile = bufname(a:originalBuffer) - let b:VCSCommandVCSType = vcsType - - set buftype=nofile - set noswapfile - let &filetype = vcsType . a:command - - if a:statusText != '' - let b:VCSCommandStatusText = a:statusText - endif - - if VCSCommandGetOption('VCSCommandDeleteOnHide', 0) - set bufhidden=delete - endif - finally - let s:isEditFileRunning -= 1 - endtry + let vcsType = getbufvar(a:originalBuffer, 'VCSCommandVCSType') + + let nameExtension = VCSCommandGetOption('VCSCommandResultBufferNameExtension', '') + if nameExtension == '' + let nameFunction = VCSCommandGetOption('VCSCommandResultBufferNameFunction', 's:GenerateResultBufferName') + else + let nameFunction = VCSCommandGetOption('VCSCommandResultBufferNameFunction', 's:GenerateResultBufferNameWithExtension') + endif + + let resultBufferName = call(nameFunction, [a:command, a:originalBuffer, vcsType, a:statusText]) + + " Protect against useless buffer set-up + let s:isEditFileRunning += 1 + try + let editCommand = VCSCommandGetOption('VCSCommandEdit', 'split') + if editCommand == 'split' + if VCSCommandGetOption('VCSCommandSplit', 'horizontal') == 'horizontal' + rightbelow split + else + vert rightbelow split + endif + endif + edit `=resultBufferName` + let b:VCSCommandCommand = a:command + let b:VCSCommandOriginalBuffer = a:originalBuffer + let b:VCSCommandSourceFile = bufname(a:originalBuffer) + let b:VCSCommandVCSType = vcsType + + set buftype=nofile + set noswapfile + let &filetype = vcsType . a:command + + if a:statusText != '' + let b:VCSCommandStatusText = a:statusText + endif + + if VCSCommandGetOption('VCSCommandDeleteOnHide', 0) + set bufhidden=delete + endif + finally + let s:isEditFileRunning -= 1 + endtry endfunction @@ -463,31 +478,31 @@ " Attempts to set the b:VCSCommandBufferInfo variable function! s:SetupBuffer() - if (exists('b:VCSCommandBufferSetup') && b:VCSCommandBufferSetup) - " This buffer is already set up. - return - endif - - if !isdirectory(@%) && (strlen(&buftype) > 0 || !filereadable(@%)) - " No special status for special buffers other than directory buffers. - return - endif - - if !VCSCommandGetOption('VCSCommandEnableBufferSetup', 0) || s:isEditFileRunning > 0 - unlet! b:VCSCommandBufferSetup - return - endif - - try - let vcsType = VCSCommandGetVCSType(bufnr('%')) - let b:VCSCommandBufferInfo = s:plugins[vcsType][1].GetBufferInfo() - silent do VCSCommand User VCSBufferSetup - catch /No suitable plugin/ - " This is not a VCS-controlled file. - let b:VCSCommandBufferInfo = [] - endtry - - let b:VCSCommandBufferSetup = 1 + if (exists('b:VCSCommandBufferSetup') && b:VCSCommandBufferSetup) + " This buffer is already set up. + return + endif + + if !isdirectory(@%) && (strlen(&buftype) > 0 || !filereadable(@%)) + " No special status for special buffers other than directory buffers. + return + endif + + if !VCSCommandGetOption('VCSCommandEnableBufferSetup', 0) || s:isEditFileRunning > 0 + unlet! b:VCSCommandBufferSetup + return + endif + + try + let vcsType = VCSCommandGetVCSType(bufnr('%')) + let b:VCSCommandBufferInfo = s:plugins[vcsType][1].GetBufferInfo() + silent do VCSCommand User VCSBufferSetup + catch /No suitable plugin/ + " This is not a VCS-controlled file. + let b:VCSCommandBufferInfo = [] + endtry + + let b:VCSCommandBufferSetup = 1 endfunction " Function: s:MarkOrigBufferForSetup(buffer) {{{2 @@ -496,15 +511,15 @@ " Returns: The VCS buffer number in a passthrough mode. function! s:MarkOrigBufferForSetup(buffer) - checktime - if a:buffer > 0 - let origBuffer = VCSCommandGetOriginalBuffer(a:buffer) - " This should never not work, but I'm paranoid - if origBuffer != a:buffer - call setbufvar(origBuffer, 'VCSCommandBufferSetup', 0) - endif - endif - return a:buffer + checktime + if a:buffer > 0 + let origBuffer = VCSCommandGetOriginalBuffer(a:buffer) + " This should never not work, but I'm paranoid + if origBuffer != a:buffer + call setbufvar(origBuffer, 'VCSCommandBufferSetup', 0) + endif + endif + return a:buffer endfunction " Function: s:OverrideOption(option, [value]) {{{2 @@ -512,29 +527,29 @@ " passed, the override is disabled. function! s:OverrideOption(option, ...) - if a:0 == 0 - call remove(s:optionOverrides[a:option], -1) - else - if !has_key(s:optionOverrides, a:option) - let s:optionOverrides[a:option] = [] - endif - call add(s:optionOverrides[a:option], a:1) - endif + if a:0 == 0 + call remove(s:optionOverrides[a:option], -1) + else + if !has_key(s:optionOverrides, a:option) + let s:optionOverrides[a:option] = [] + endif + call add(s:optionOverrides[a:option], a:1) + endif endfunction " Function: s:WipeoutCommandBuffers() {{{2 " Clears all current VCS output buffers of the specified type for a given source. function! s:WipeoutCommandBuffers(originalBuffer, VCSCommand) - let buffer = 1 - while buffer <= bufnr('$') - if getbufvar(buffer, 'VCSCommandOriginalBuffer') == a:originalBuffer - if getbufvar(buffer, 'VCSCommandCommand') == a:VCSCommand - execute 'bw' buffer - endif - endif - let buffer = buffer + 1 - endwhile + let buffer = 1 + while buffer <= bufnr('$') + if getbufvar(buffer, 'VCSCommandOriginalBuffer') == a:originalBuffer + if getbufvar(buffer, 'VCSCommandCommand') == a:VCSCommand + execute 'bw' buffer + endif + endif + let buffer = buffer + 1 + endwhile endfunction " Function: s:VimDiffRestore(vimDiffBuff) {{{2 @@ -543,106 +558,106 @@ " the appropriate setting command stored with that original buffer. function! s:VimDiffRestore(vimDiffBuff) - let s:isEditFileRunning += 1 - try - if exists('s:vimDiffSourceBuffer') - if a:vimDiffBuff == s:vimDiffSourceBuffer - " Original file is being removed. - unlet! s:vimDiffSourceBuffer - unlet! s:vimDiffRestoreCmd - unlet! s:vimDiffScratchList - else - let index = index(s:vimDiffScratchList, a:vimDiffBuff) - if index >= 0 - call remove(s:vimDiffScratchList, index) - if len(s:vimDiffScratchList) == 0 - if exists('s:vimDiffRestoreCmd') - " All scratch buffers are gone, reset the original. - " Only restore if the source buffer is still in Diff mode - - let sourceWinNR = bufwinnr(s:vimDiffSourceBuffer) - if sourceWinNR != -1 - " The buffer is visible in at least one window - let currentWinNR = winnr() - while winbufnr(sourceWinNR) != -1 - if winbufnr(sourceWinNR) == s:vimDiffSourceBuffer - execute sourceWinNR . 'wincmd w' - if getwinvar(0, '&diff') - execute s:vimDiffRestoreCmd - endif - endif - let sourceWinNR = sourceWinNR + 1 - endwhile - execute currentWinNR . 'wincmd w' - else - " The buffer is hidden. It must be visible in order to set the - " diff option. - let currentBufNR = bufnr('') - execute 'hide buffer' s:vimDiffSourceBuffer - if getwinvar(0, '&diff') - execute s:vimDiffRestoreCmd - endif - execute 'hide buffer' currentBufNR - endif - - unlet s:vimDiffRestoreCmd - endif - " All buffers are gone. - unlet s:vimDiffSourceBuffer - unlet s:vimDiffScratchList - endif - endif - endif - endif - finally - let s:isEditFileRunning -= 1 - endtry + let s:isEditFileRunning += 1 + try + if exists('s:vimDiffSourceBuffer') + if a:vimDiffBuff == s:vimDiffSourceBuffer + " Original file is being removed. + unlet! s:vimDiffSourceBuffer + unlet! s:vimDiffRestoreCmd + unlet! s:vimDiffScratchList + else + let index = index(s:vimDiffScratchList, a:vimDiffBuff) + if index >= 0 + call remove(s:vimDiffScratchList, index) + if len(s:vimDiffScratchList) == 0 + if exists('s:vimDiffRestoreCmd') + " All scratch buffers are gone, reset the original. + " Only restore if the source buffer is still in Diff mode + + let sourceWinNR = bufwinnr(s:vimDiffSourceBuffer) + if sourceWinNR != -1 + " The buffer is visible in at least one window + let currentWinNR = winnr() + while winbufnr(sourceWinNR) != -1 + if winbufnr(sourceWinNR) == s:vimDiffSourceBuffer + execute sourceWinNR . 'wincmd w' + if getwinvar(0, '&diff') + execute s:vimDiffRestoreCmd + endif + endif + let sourceWinNR = sourceWinNR + 1 + endwhile + execute currentWinNR . 'wincmd w' + else + " The buffer is hidden. It must be visible in order to set the + " diff option. + let currentBufNR = bufnr('') + execute 'hide buffer' s:vimDiffSourceBuffer + if getwinvar(0, '&diff') + execute s:vimDiffRestoreCmd + endif + execute 'hide buffer' currentBufNR + endif + + unlet s:vimDiffRestoreCmd + endif + " All buffers are gone. + unlet s:vimDiffSourceBuffer + unlet s:vimDiffScratchList + endif + endif + endif + endif + finally + let s:isEditFileRunning -= 1 + endtry endfunction " Section: Generic VCS command functions {{{1 " Function: s:VCSCommit() {{{2 function! s:VCSCommit(bang, message) - try - let vcsType = VCSCommandGetVCSType(bufnr('%')) - if !has_key(s:plugins, vcsType) - throw 'Unknown VCS type: ' . vcsType - endif - - let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) - - " Handle the commit message being specified. If a message is supplied, it - " is used; if bang is supplied, an empty message is used; otherwise, the - " user is provided a buffer from which to edit the commit message. - - if strlen(a:message) > 0 || a:bang == '!' - return s:VCSFinishCommit([a:message], originalBuffer) - endif - - call s:EditFile('commitlog', originalBuffer, '') - set ft=vcscommit - - " Create a commit mapping. - - nnoremap VCSCommit :call VCSFinishCommitWithBuffer() - - silent 0put ='VCS: ----------------------------------------------------------------------' - silent put ='VCS: Please enter log message. Lines beginning with ''VCS:'' are removed automatically.' - silent put ='VCS: To finish the commit, Type cc (or your own VCSCommit mapping)' - - if VCSCommandGetOption('VCSCommandCommitOnWrite', 1) == 1 - set buftype=acwrite - au VCSCommandCommit BufWriteCmd call s:VCSFinishCommitWithBuffer() - silent put ='VCS: or write this buffer' - endif - - silent put ='VCS: ----------------------------------------------------------------------' - $ - set nomodified - catch - call s:ReportError(v:exception) - return -1 - endtry + try + let vcsType = VCSCommandGetVCSType(bufnr('%')) + if !has_key(s:plugins, vcsType) + throw 'Unknown VCS type: ' . vcsType + endif + + let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) + + " Handle the commit message being specified. If a message is supplied, it + " is used; if bang is supplied, an empty message is used; otherwise, the + " user is provided a buffer from which to edit the commit message. + + if strlen(a:message) > 0 || a:bang == '!' + return s:VCSFinishCommit([a:message], originalBuffer) + endif + + call s:EditFile('commitlog', originalBuffer, '') + set ft=vcscommit + + " Create a commit mapping. + + nnoremap VCSCommit :call VCSFinishCommitWithBuffer() + + silent 0put ='VCS: ----------------------------------------------------------------------' + silent put ='VCS: Please enter log message. Lines beginning with ''VCS:'' are removed automatically.' + silent put ='VCS: To finish the commit, Type cc (or your own VCSCommit mapping)' + + if VCSCommandGetOption('VCSCommandCommitOnWrite', 1) == 1 + set buftype=acwrite + au VCSCommandCommit BufWriteCmd call s:VCSFinishCommitWithBuffer() + silent put ='VCS: or write this buffer' + endif + + silent put ='VCS: ----------------------------------------------------------------------' + $ + set nomodified + catch + call s:ReportError(v:exception) + return -1 + endtry endfunction " Function: s:VCSFinishCommitWithBuffer() {{{2 @@ -650,178 +665,178 @@ " which removes all lines starting with 'VCS:'. function! s:VCSFinishCommitWithBuffer() - set nomodified - let currentBuffer = bufnr('%') - let logMessageList = getbufline('%', 1, '$') - call filter(logMessageList, 'v:val !~ ''^\s*VCS:''') - let resultBuffer = s:VCSFinishCommit(logMessageList, b:VCSCommandOriginalBuffer) - if resultBuffer >= 0 - execute 'bw' currentBuffer - endif - return resultBuffer + set nomodified + let currentBuffer = bufnr('%') + let logMessageList = getbufline('%', 1, '$') + call filter(logMessageList, 'v:val !~ ''^\s*VCS:''') + let resultBuffer = s:VCSFinishCommit(logMessageList, b:VCSCommandOriginalBuffer) + if resultBuffer >= 0 + execute 'bw' currentBuffer + endif + return resultBuffer endfunction " Function: s:VCSFinishCommit(logMessageList, originalBuffer) {{{2 function! s:VCSFinishCommit(logMessageList, originalBuffer) - let shellSlashBak = &shellslash - try - set shellslash - let messageFileName = tempname() - call writefile(a:logMessageList, messageFileName) - try - let resultBuffer = s:ExecuteVCSCommand('Commit', [messageFileName]) - if resultBuffer < 0 - return resultBuffer - endif - return s:MarkOrigBufferForSetup(resultBuffer) - finally - call delete(messageFileName) - endtry - finally - let &shellslash = shellSlashBak - endtry + let shellSlashBak = &shellslash + try + set shellslash + let messageFileName = tempname() + call writefile(a:logMessageList, messageFileName) + try + let resultBuffer = s:ExecuteVCSCommand('Commit', [messageFileName]) + if resultBuffer < 0 + return resultBuffer + endif + return s:MarkOrigBufferForSetup(resultBuffer) + finally + call delete(messageFileName) + endtry + finally + let &shellslash = shellSlashBak + endtry endfunction " Function: s:VCSGotoOriginal(bang) {{{2 function! s:VCSGotoOriginal(bang) - let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) - if originalBuffer > 0 - let origWinNR = bufwinnr(originalBuffer) - if origWinNR == -1 - execute 'buffer' originalBuffer - else - execute origWinNR . 'wincmd w' - endif - if a:bang == '!' - let buffnr = 1 - let buffmaxnr = bufnr('$') - while buffnr <= buffmaxnr - if getbufvar(buffnr, 'VCSCommandOriginalBuffer') == originalBuffer - execute 'bw' buffnr - endif - let buffnr = buffnr + 1 - endwhile - endif - endif + let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) + if originalBuffer > 0 + let origWinNR = bufwinnr(originalBuffer) + if origWinNR == -1 + execute 'buffer' originalBuffer + else + execute origWinNR . 'wincmd w' + endif + if a:bang == '!' + let buffnr = 1 + let buffmaxnr = bufnr('$') + while buffnr <= buffmaxnr + if getbufvar(buffnr, 'VCSCommandOriginalBuffer') == originalBuffer + execute 'bw' buffnr + endif + let buffnr = buffnr + 1 + endwhile + endif + endif endfunction " Function: s:VCSVimDiff(...) {{{2 function! s:VCSVimDiff(...) - try - let vcsType = VCSCommandGetVCSType(bufnr('%')) - if !has_key(s:plugins, vcsType) - throw 'Unknown VCS type: ' . vcsType - endif - let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) - let s:isEditFileRunning = s:isEditFileRunning + 1 - try - " If there's already a VimDiff'ed window, restore it. - " There may only be one VCSVimDiff original window at a time. - - if exists('s:vimDiffSourceBuffer') && s:vimDiffSourceBuffer != originalBuffer - " Clear the existing vimdiff setup by removing the result buffers. - call s:WipeoutCommandBuffers(s:vimDiffSourceBuffer, 'vimdiff') - endif - - " Split and diff - if(a:0 == 2) - " Reset the vimdiff system, as 2 explicit versions were provided. - if exists('s:vimDiffSourceBuffer') - call s:WipeoutCommandBuffers(s:vimDiffSourceBuffer, 'vimdiff') - endif - let resultBuffer = s:plugins[vcsType][1].Review([a:1]) - if resultBuffer < 0 - echomsg 'Can''t open revision ' . a:1 - return resultBuffer - endif - let b:VCSCommandCommand = 'vimdiff' - diffthis - let s:vimDiffScratchList = [resultBuffer] - " If no split method is defined, cheat, and set it to vertical. - try - call s:OverrideOption('VCSCommandSplit', VCSCommandGetOption('VCSCommandDiffSplit', VCSCommandGetOption('VCSCommandSplit', 'vertical'))) - let resultBuffer = s:plugins[vcsType][1].Review([a:2]) - finally - call s:OverrideOption('VCSCommandSplit') - endtry - if resultBuffer < 0 - echomsg 'Can''t open revision ' . a:1 - return resultBuffer - endif - let b:VCSCommandCommand = 'vimdiff' - diffthis - let s:vimDiffScratchList += [resultBuffer] - else - " Add new buffer - call s:OverrideOption('VCSCommandEdit', 'split') - try - " Force splitting behavior, otherwise why use vimdiff? - call s:OverrideOption('VCSCommandSplit', VCSCommandGetOption('VCSCommandDiffSplit', VCSCommandGetOption('VCSCommandSplit', 'vertical'))) - try - if(a:0 == 0) - let resultBuffer = s:plugins[vcsType][1].Review([]) - else - let resultBuffer = s:plugins[vcsType][1].Review([a:1]) - endif - finally - call s:OverrideOption('VCSCommandSplit') - endtry - finally - call s:OverrideOption('VCSCommandEdit') - endtry - if resultBuffer < 0 - echomsg 'Can''t open current revision' - return resultBuffer - endif - let b:VCSCommandCommand = 'vimdiff' - diffthis - - if !exists('s:vimDiffSourceBuffer') - " New instance of vimdiff. - let s:vimDiffScratchList = [resultBuffer] - - " This could have been invoked on a VCS result buffer, not the - " original buffer. - wincmd W - execute 'buffer' originalBuffer - " Store info for later original buffer restore - let s:vimDiffRestoreCmd = - \ 'call setbufvar('.originalBuffer.', ''&diff'', '.getbufvar(originalBuffer, '&diff').')' - \ . '|call setbufvar('.originalBuffer.', ''&foldcolumn'', '.getbufvar(originalBuffer, '&foldcolumn').')' - \ . '|call setbufvar('.originalBuffer.', ''&foldenable'', '.getbufvar(originalBuffer, '&foldenable').')' - \ . '|call setbufvar('.originalBuffer.', ''&foldmethod'', '''.getbufvar(originalBuffer, '&foldmethod').''')' - \ . '|call setbufvar('.originalBuffer.', ''&foldlevel'', '''.getbufvar(originalBuffer, '&foldlevel').''')' - \ . '|call setbufvar('.originalBuffer.', ''&scrollbind'', '.getbufvar(originalBuffer, '&scrollbind').')' - \ . '|call setbufvar('.originalBuffer.', ''&wrap'', '.getbufvar(originalBuffer, '&wrap').')' - \ . '|if &foldmethod==''manual''|execute ''normal zE''|endif' - diffthis - wincmd w - else - " Adding a window to an existing vimdiff - let s:vimDiffScratchList += [resultBuffer] - endif - endif - - let s:vimDiffSourceBuffer = originalBuffer - - " Avoid executing the modeline in the current buffer after the autocommand. - - let currentBuffer = bufnr('%') - let saveModeline = getbufvar(currentBuffer, '&modeline') - try - call setbufvar(currentBuffer, '&modeline', 0) - silent do VCSCommand User VCSVimDiffFinish - finally - call setbufvar(currentBuffer, '&modeline', saveModeline) - endtry - return resultBuffer - finally - let s:isEditFileRunning = s:isEditFileRunning - 1 - endtry - catch - call s:ReportError(v:exception) - return -1 - endtry + try + let vcsType = VCSCommandGetVCSType(bufnr('%')) + if !has_key(s:plugins, vcsType) + throw 'Unknown VCS type: ' . vcsType + endif + let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) + let s:isEditFileRunning = s:isEditFileRunning + 1 + try + " If there's already a VimDiff'ed window, restore it. + " There may only be one VCSVimDiff original window at a time. + + if exists('s:vimDiffSourceBuffer') && s:vimDiffSourceBuffer != originalBuffer + " Clear the existing vimdiff setup by removing the result buffers. + call s:WipeoutCommandBuffers(s:vimDiffSourceBuffer, 'vimdiff') + endif + + " Split and diff + if(a:0 == 2) + " Reset the vimdiff system, as 2 explicit versions were provided. + if exists('s:vimDiffSourceBuffer') + call s:WipeoutCommandBuffers(s:vimDiffSourceBuffer, 'vimdiff') + endif + let resultBuffer = s:plugins[vcsType][1].Review([a:1]) + if resultBuffer < 0 + echomsg 'Can''t open revision ' . a:1 + return resultBuffer + endif + let b:VCSCommandCommand = 'vimdiff' + diffthis + let s:vimDiffScratchList = [resultBuffer] + " If no split method is defined, cheat, and set it to vertical. + try + call s:OverrideOption('VCSCommandSplit', VCSCommandGetOption('VCSCommandDiffSplit', VCSCommandGetOption('VCSCommandSplit', 'vertical'))) + let resultBuffer = s:plugins[vcsType][1].Review([a:2]) + finally + call s:OverrideOption('VCSCommandSplit') + endtry + if resultBuffer < 0 + echomsg 'Can''t open revision ' . a:1 + return resultBuffer + endif + let b:VCSCommandCommand = 'vimdiff' + diffthis + let s:vimDiffScratchList += [resultBuffer] + else + " Add new buffer + call s:OverrideOption('VCSCommandEdit', 'split') + try + " Force splitting behavior, otherwise why use vimdiff? + call s:OverrideOption('VCSCommandSplit', VCSCommandGetOption('VCSCommandDiffSplit', VCSCommandGetOption('VCSCommandSplit', 'vertical'))) + try + if(a:0 == 0) + let resultBuffer = s:plugins[vcsType][1].Review([]) + else + let resultBuffer = s:plugins[vcsType][1].Review([a:1]) + endif + finally + call s:OverrideOption('VCSCommandSplit') + endtry + finally + call s:OverrideOption('VCSCommandEdit') + endtry + if resultBuffer < 0 + echomsg 'Can''t open current revision' + return resultBuffer + endif + let b:VCSCommandCommand = 'vimdiff' + diffthis + + if !exists('s:vimDiffSourceBuffer') + " New instance of vimdiff. + let s:vimDiffScratchList = [resultBuffer] + + " This could have been invoked on a VCS result buffer, not the + " original buffer. + wincmd W + execute 'buffer' originalBuffer + " Store info for later original buffer restore + let s:vimDiffRestoreCmd = + \ 'call setbufvar('.originalBuffer.', ''&diff'', '.getbufvar(originalBuffer, '&diff').')' + \ . '|call setbufvar('.originalBuffer.', ''&foldcolumn'', '.getbufvar(originalBuffer, '&foldcolumn').')' + \ . '|call setbufvar('.originalBuffer.', ''&foldenable'', '.getbufvar(originalBuffer, '&foldenable').')' + \ . '|call setbufvar('.originalBuffer.', ''&foldmethod'', '''.getbufvar(originalBuffer, '&foldmethod').''')' + \ . '|call setbufvar('.originalBuffer.', ''&foldlevel'', '''.getbufvar(originalBuffer, '&foldlevel').''')' + \ . '|call setbufvar('.originalBuffer.', ''&scrollbind'', '.getbufvar(originalBuffer, '&scrollbind').')' + \ . '|call setbufvar('.originalBuffer.', ''&wrap'', '.getbufvar(originalBuffer, '&wrap').')' + \ . '|if &foldmethod==''manual''|execute ''normal zE''|endif' + diffthis + wincmd w + else + " Adding a window to an existing vimdiff + let s:vimDiffScratchList += [resultBuffer] + endif + endif + + let s:vimDiffSourceBuffer = originalBuffer + + " Avoid executing the modeline in the current buffer after the autocommand. + + let currentBuffer = bufnr('%') + let saveModeline = getbufvar(currentBuffer, '&modeline') + try + call setbufvar(currentBuffer, '&modeline', 0) + silent do VCSCommand User VCSVimDiffFinish + finally + call setbufvar(currentBuffer, '&modeline', saveModeline) + endtry + return resultBuffer + finally + let s:isEditFileRunning = s:isEditFileRunning - 1 + endtry + catch + call s:ReportError(v:exception) + return -1 + endtry endfunction " Section: Public functions {{{1 @@ -829,42 +844,61 @@ " Function: VCSCommandGetVCSType() {{{2 " Sets the b:VCSCommandVCSType variable in the given buffer to the " appropriate source control system name. +" +" This uses the Identify extension function to test the buffer. If the +" Identify function returns VCSCOMMAND_IDENTIFY_EXACT, the match is considered +" exact. If the Identify function returns VCSCOMMAND_IDENTIFY_INEXACT, the +" match is considered inexact, and is only applied if no exact match is found. +" Multiple inexact matches is currently considered an error. function! VCSCommandGetVCSType(buffer) - let vcsType = getbufvar(a:buffer, 'VCSCommandVCSType') - if strlen(vcsType) > 0 - return vcsType - endif - for vcsType in keys(s:plugins) - if s:plugins[vcsType][1].Identify(a:buffer) - call setbufvar(a:buffer, 'VCSCommandVCSType', vcsType) - return vcsType - endif - endfor - throw 'No suitable plugin' + let vcsType = getbufvar(a:buffer, 'VCSCommandVCSType') + if strlen(vcsType) > 0 + return vcsType + endif + let matches = [] + for vcsType in keys(s:plugins) + let identified = s:plugins[vcsType][1].Identify(a:buffer) + if identified + if identified == g:VCSCOMMAND_IDENTIFY_EXACT + let matches = [vcsType] + break + else + let matches += [vcsType] + endif + endif + endfor + if len(matches) == 1 + call setbufvar(a:buffer, 'VCSCommandVCSType', matches[0]) + return matches[0] + elseif len(matches) == 0 + throw 'No suitable plugin' + else + throw 'Too many matching VCS: ' . join(matches) + endif endfunction " Function: VCSCommandChdir(directory) {{{2 " Changes the current directory, respecting :lcd changes. function! VCSCommandChdir(directory) - let command = 'cd' - if exists("*haslocaldir") && haslocaldir() - let command = 'lcd' - endif - execute command escape(a:directory, ' ') + let command = 'cd' + if exists("*haslocaldir") && haslocaldir() + let command = 'lcd' + endif + execute command escape(a:directory, ' ') endfunction " Function: VCSCommandChangeToCurrentFileDir() {{{2 " Go to the directory in which the given file is located. function! VCSCommandChangeToCurrentFileDir(fileName) - let oldCwd = getcwd() - let newCwd = fnamemodify(resolve(a:fileName), ':p:h') - if strlen(newCwd) > 0 - call VCSCommandChdir(newCwd) - endif - return oldCwd + let oldCwd = getcwd() + let newCwd = fnamemodify(resolve(a:fileName), ':p:h') + if strlen(newCwd) > 0 + call VCSCommandChdir(newCwd) + endif + return oldCwd endfunction " Function: VCSCommandGetOriginalBuffer(vcsBuffer) {{{2 @@ -872,118 +906,128 @@ " for a given buffer. function! VCSCommandGetOriginalBuffer(vcsBuffer) - let origBuffer = getbufvar(a:vcsBuffer, 'VCSCommandOriginalBuffer') - if origBuffer - if bufexists(origBuffer) - return origBuffer - else - " Original buffer no longer exists. - throw 'Original buffer for this VCS buffer no longer exists.' - endif - else - " No original buffer - return a:vcsBuffer - endif + let origBuffer = getbufvar(a:vcsBuffer, 'VCSCommandOriginalBuffer') + if origBuffer + if bufexists(origBuffer) + return origBuffer + else + " Original buffer no longer exists. + throw 'Original buffer for this VCS buffer no longer exists.' + endif + else + " No original buffer + return a:vcsBuffer + endif endfunction " Function: VCSCommandRegisterModule(name, file, commandMap) {{{2 " Allows VCS modules to register themselves. function! VCSCommandRegisterModule(name, path, commandMap, mappingMap) - let s:plugins[a:name] = [a:path, a:commandMap, a:mappingMap] - if !empty(a:mappingMap) - \ && !VCSCommandGetOption('VCSCommandDisableMappings', 0) - \ && !VCSCommandGetOption('VCSCommandDisableExtensionMappings', 0) - for mapname in keys(a:mappingMap) - execute 'noremap ' . mapname ':call ExecuteExtensionMapping(''' . mapname . ''')' - endfor - endif -endfunction - -" Function: VCSCommandDoCommand(cmd, cmdName, statusText) {{{2 + let s:plugins[a:name] = [a:path, a:commandMap, a:mappingMap] + if !empty(a:mappingMap) + \ && !VCSCommandGetOption('VCSCommandDisableMappings', 0) + \ && !VCSCommandGetOption('VCSCommandDisableExtensionMappings', 0) + for mapname in keys(a:mappingMap) + execute 'noremap ' . mapname ':call ExecuteExtensionMapping(''' . mapname . ''')' + endfor + endif +endfunction + +" Function: VCSCommandDoCommand(cmd, cmdName, statusText, [options]) {{{2 " General skeleton for VCS function execution. The given command is executed " after appending the current buffer name (or substituting it for " , if such a token is present). The output is captured in a " new buffer. +" +" The optional 'options' Dictionary may contain the following options: +" allowNonZeroExit: if non-zero, if the underlying VCS command has a +" non-zero exit status, the command is still considered +" successfuly. This defaults to zero. " Returns: name of the new command buffer containing the command results -function! VCSCommandDoCommand(cmd, cmdName, statusText) - let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) - if originalBuffer == -1 - throw 'Original buffer no longer exists, aborting.' - endif - - let path = resolve(bufname(originalBuffer)) - - " Work with netrw or other systems where a directory listing is displayed in - " a buffer. - - if isdirectory(path) - let fileName = '.' - else - let fileName = fnamemodify(path, ':t') - endif - - if match(a:cmd, '') > 0 - let fullCmd = substitute(a:cmd, '', fileName, 'g') - else - let fullCmd = a:cmd . ' "' . fileName . '"' - endif - - " Change to the directory of the current buffer. This is done for CVS, but - " is left in for other systems as it does not affect them negatively. - - let oldCwd = VCSCommandChangeToCurrentFileDir(path) - try - let output = system(fullCmd) - finally - call VCSCommandChdir(oldCwd) - endtry - - " HACK: if line endings in the repository have been corrupted, the output - " of the command will be confused. - let output = substitute(output, "\r", '', 'g') - - " HACK: CVS diff command does not return proper error codes - if v:shell_error && (a:cmdName != 'diff' || getbufvar(originalBuffer, 'VCSCommandVCSType') != 'CVS') - if strlen(output) == 0 - throw 'Version control command failed' - else - let output = substitute(output, '\n', ' ', 'g') - throw 'Version control command failed: ' . output - endif - endif - if strlen(output) == 0 - " Handle case of no output. In this case, it is important to check the - " file status, especially since cvs edit/unedit may change the attributes - " of the file with no visible output. - - checktime - return 0 - endif - - call s:EditFile(a:cmdName, originalBuffer, a:statusText) - - silent 0put=output - - " The last command left a blank line at the end of the buffer. If the - " last line is folded (a side effect of the 'put') then the attempt to - " remove the blank line will kill the last fold. - " - " This could be fixed by explicitly detecting whether the last line is - " within a fold, but I prefer to simply unfold the result buffer altogether. - - if has('folding') - normal zR - endif - - $d - 1 - - " Define the environment and execute user-defined hooks. - - silent do VCSCommand User VCSBufferCreated - return bufnr('%') +function! VCSCommandDoCommand(cmd, cmdName, statusText, options) + let allowNonZeroExit = 0 + if has_key(a:options, 'allowNonZeroExit') + let allowNonZeroExit = a:options.allowNonZeroExit + endif + + let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) + if originalBuffer == -1 + throw 'Original buffer no longer exists, aborting.' + endif + + let path = resolve(bufname(originalBuffer)) + + " Work with netrw or other systems where a directory listing is displayed in + " a buffer. + + if isdirectory(path) + let fileName = '.' + else + let fileName = fnamemodify(path, ':t') + endif + + if match(a:cmd, '') > 0 + let fullCmd = substitute(a:cmd, '', fileName, 'g') + else + let fullCmd = a:cmd . ' "' . fileName . '"' + endif + + " Change to the directory of the current buffer. This is done for CVS, but + " is left in for other systems as it does not affect them negatively. + + let oldCwd = VCSCommandChangeToCurrentFileDir(path) + try + let output = system(fullCmd) + finally + call VCSCommandChdir(oldCwd) + endtry + + " HACK: if line endings in the repository have been corrupted, the output + " of the command will be confused. + let output = substitute(output, "\r", '', 'g') + + if v:shell_error && !allowNonZeroExit + if strlen(output) == 0 + throw 'Version control command failed' + else + let output = substitute(output, '\n', ' ', 'g') + throw 'Version control command failed: ' . output + endif + endif + + if strlen(output) == 0 + " Handle case of no output. In this case, it is important to check the + " file status, especially since cvs edit/unedit may change the attributes + " of the file with no visible output. + + checktime + return 0 + endif + + call s:EditFile(a:cmdName, originalBuffer, a:statusText) + + silent 0put=output + + " The last command left a blank line at the end of the buffer. If the + " last line is folded (a side effect of the 'put') then the attempt to + " remove the blank line will kill the last fold. + " + " This could be fixed by explicitly detecting whether the last line is + " within a fold, but I prefer to simply unfold the result buffer altogether. + + if has('folding') + normal zR + endif + + $d + 1 + + " Define the environment and execute user-defined hooks. + + silent do VCSCommand User VCSBufferCreated + return bufnr('%') endfunction " Function: VCSCommandGetOption(name, default) {{{2 @@ -991,42 +1035,42 @@ " searched in the window, buffer, then global spaces. function! VCSCommandGetOption(name, default) - if has_key(s:optionOverrides, a:name) && len(s:optionOverrides[a:name]) > 0 - return s:optionOverrides[a:name][-1] - elseif exists('w:' . a:name) - return w:{a:name} - elseif exists('b:' . a:name) - return b:{a:name} - elseif exists('g:' . a:name) - return g:{a:name} - else - return a:default - endif + if has_key(s:optionOverrides, a:name) && len(s:optionOverrides[a:name]) > 0 + return s:optionOverrides[a:name][-1] + elseif exists('w:' . a:name) + return w:{a:name} + elseif exists('b:' . a:name) + return b:{a:name} + elseif exists('g:' . a:name) + return g:{a:name} + else + return a:default + endif endfunction " Function: VCSCommandDisableBufferSetup() {{{2 " Global function for deactivating the buffer autovariables. function! VCSCommandDisableBufferSetup() - let g:VCSCommandEnableBufferSetup = 0 - silent! augroup! VCSCommandPlugin + let g:VCSCommandEnableBufferSetup = 0 + silent! augroup! VCSCommandPlugin endfunction " Function: VCSCommandEnableBufferSetup() {{{2 " Global function for activating the buffer autovariables. function! VCSCommandEnableBufferSetup() - let g:VCSCommandEnableBufferSetup = 1 - augroup VCSCommandPlugin - au! - au BufEnter * call s:SetupBuffer() - augroup END - - " Only auto-load if the plugin is fully loaded. This gives other plugins a - " chance to run. - if g:loaded_VCSCommand == 2 - call s:SetupBuffer() - endif + let g:VCSCommandEnableBufferSetup = 1 + augroup VCSCommandPlugin + au! + au BufEnter * call s:SetupBuffer() + augroup END + + " Only auto-load if the plugin is fully loaded. This gives other plugins a + " chance to run. + if g:loaded_VCSCommand == 2 + call s:SetupBuffer() + endif endfunction " Function: VCSCommandGetStatusLine() {{{2 @@ -1035,20 +1079,20 @@ " variable for how to do this). function! VCSCommandGetStatusLine() - if exists('b:VCSCommandCommand') - " This is a result buffer. Return nothing because the buffer name - " contains information already. - return '' - endif - - if exists('b:VCSCommandVCSType') - \ && exists('g:VCSCommandEnableBufferSetup') - \ && g:VCSCommandEnableBufferSetup - \ && exists('b:VCSCommandBufferInfo') - return '[' . join(extend([b:VCSCommandVCSType], b:VCSCommandBufferInfo), ' ') . ']' - else - return '' - endif + if exists('b:VCSCommandCommand') + " This is a result buffer. Return nothing because the buffer name + " contains information already. + return '' + endif + + if exists('b:VCSCommandVCSType') + \ && exists('g:VCSCommandEnableBufferSetup') + \ && g:VCSCommandEnableBufferSetup + \ && exists('b:VCSCommandBufferInfo') + return '[' . join(extend([b:VCSCommandVCSType], b:VCSCommandBufferInfo), ' ') . ']' + else + return '' + endif endfunction " Section: Command definitions {{{1 @@ -1099,54 +1143,54 @@ " Section: Default mappings {{{1 if !VCSCommandGetOption('VCSCommandDisableMappings', 0) - if !hasmapto('VCSAdd') - nmap ca VCSAdd - endif - if !hasmapto('VCSAnnotate') - nmap cn VCSAnnotate - endif - if !hasmapto('VCSClearAndGotoOriginal') - nmap cG VCSClearAndGotoOriginal - endif - if !hasmapto('VCSCommit') - nmap cc VCSCommit - endif - if !hasmapto('VCSDelete') - nmap cD VCSDelete - endif - if !hasmapto('VCSDiff') - nmap cd VCSDiff - endif - if !hasmapto('VCSGotoOriginal') - nmap cg VCSGotoOriginal - endif - if !hasmapto('VCSInfo') - nmap ci VCSInfo - endif - if !hasmapto('VCSLock') - nmap cL VCSLock - endif - if !hasmapto('VCSLog') - nmap cl VCSLog - endif - if !hasmapto('VCSRevert') - nmap cq VCSRevert - endif - if !hasmapto('VCSReview') - nmap cr VCSReview - endif - if !hasmapto('VCSStatus') - nmap cs VCSStatus - endif - if !hasmapto('VCSUnlock') - nmap cU VCSUnlock - endif - if !hasmapto('VCSUpdate') - nmap cu VCSUpdate - endif - if !hasmapto('VCSVimDiff') - nmap cv VCSVimDiff - endif + if !hasmapto('VCSAdd') + nmap ca VCSAdd + endif + if !hasmapto('VCSAnnotate') + nmap cn VCSAnnotate + endif + if !hasmapto('VCSClearAndGotoOriginal') + nmap cG VCSClearAndGotoOriginal + endif + if !hasmapto('VCSCommit') + nmap cc VCSCommit + endif + if !hasmapto('VCSDelete') + nmap cD VCSDelete + endif + if !hasmapto('VCSDiff') + nmap cd VCSDiff + endif + if !hasmapto('VCSGotoOriginal') + nmap cg VCSGotoOriginal + endif + if !hasmapto('VCSInfo') + nmap ci VCSInfo + endif + if !hasmapto('VCSLock') + nmap cL VCSLock + endif + if !hasmapto('VCSLog') + nmap cl VCSLog + endif + if !hasmapto('VCSRevert') + nmap cq VCSRevert + endif + if !hasmapto('VCSReview') + nmap cr VCSReview + endif + if !hasmapto('VCSStatus') + nmap cs VCSStatus + endif + if !hasmapto('VCSUnlock') + nmap cU VCSUnlock + endif + if !hasmapto('VCSUpdate') + nmap cu VCSUpdate + endif + if !hasmapto('VCSVimDiff') + nmap cv VCSVimDiff + endif endif " Section: Menu items {{{1 @@ -1165,14 +1209,14 @@ " Section: Autocommands to restore vimdiff state {{{1 augroup VimDiffRestore - au! - au BufUnload * call s:VimDiffRestore(str2nr(expand(''))) + au! + au BufUnload * call s:VimDiffRestore(str2nr(expand(''))) augroup END " Section: Optional activation of buffer management {{{1 if VCSCommandGetOption('VCSCommandEnableBufferSetup', 0) - call VCSCommandEnableBufferSetup() + call VCSCommandEnableBufferSetup() endif " Section: VIM shutdown hook {{{1 @@ -1183,21 +1227,21 @@ " Function: s:CloseAllResultBuffers() {{{2 " Closes all vcscommand result buffers. function! s:CloseAllResultBuffers() - " This avoids using bufdo as that may load buffers already loaded in another - " vim process, resulting in an error. - let buffnr = 1 - let buffmaxnr = bufnr('$') - while buffnr <= buffmaxnr - if getbufvar(buffnr, 'VCSCommandOriginalBuffer') != "" - execute 'bw' buffnr - endif - let buffnr = buffnr + 1 - endwhile + " This avoids using bufdo as that may load buffers already loaded in another + " vim process, resulting in an error. + let buffnr = 1 + let buffmaxnr = bufnr('$') + while buffnr <= buffmaxnr + if getbufvar(buffnr, 'VCSCommandOriginalBuffer') != "" + execute 'bw' buffnr + endif + let buffnr = buffnr + 1 + endwhile endfunction augroup VCSCommandVIMShutdown - au! - au VimLeavePre * call s:CloseAllResultBuffers() + au! + au VimLeavePre * call s:CloseAllResultBuffers() augroup END " Section: Plugin completion {{{1 Modified: trunk/packages/vim-scripts/plugin/vcscvs.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/vcscvs.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/vcscvs.vim (original) +++ trunk/packages/vim-scripts/plugin/vcscvs.vim Tue Apr 8 21:07:01 2008 @@ -82,36 +82,36 @@ " Section: Plugin header {{{1 if v:version < 700 - echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None - finish + echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None + finish +endif + +runtime plugin/vcscommand.vim + +if !executable(VCSCommandGetOption('VCSCommandCVSExec', 'cvs')) + " CVS is not installed + finish endif let s:save_cpo=&cpo set cpo&vim -runtime plugin/vcscommand.vim - -if !executable(VCSCommandGetOption('VCSCommandCVSExec', 'cvs')) - " CVS is not installed - finish -endif - " Section: Variable initialization {{{1 let s:cvsFunctions = {} " Section: Utility functions {{{1 -" Function: s:DoCommand(cmd, cmdName, statusText) {{{2 +" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2 " Wrapper to VCSCommandDoCommand to add the name of the CVS executable to the " command argument. -function! s:DoCommand(cmd, cmdName, statusText) - if VCSCommandGetVCSType(expand('%')) == 'CVS' - let fullCmd = VCSCommandGetOption('VCSCommandCVSExec', 'cvs') . ' ' . a:cmd - return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText) - else - throw 'CVS VCSCommand plugin called on non-CVS item.' - endif +function! s:DoCommand(cmd, cmdName, statusText, options) + if VCSCommandGetVCSType(expand('%')) == 'CVS' + let fullCmd = VCSCommandGetOption('VCSCommandCVSExec', 'cvs') . ' ' . a:cmd + return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options) + else + throw 'CVS VCSCommand plugin called on non-CVS item.' + endif endfunction " Function: GetRevision() {{{2 @@ -119,139 +119,139 @@ " Returns: Revision number or an empty string if an error occurs. function! GetRevision() - if !exists('b:VCSCommandBufferInfo') - let b:VCSCommandBufferInfo = s:cvsFunctions.GetBufferInfo() - endif - - if len(b:VCSCommandBufferInfo) > 0 - return b:VCSCommandBufferInfo[0] - else - return '' - endif + if !exists('b:VCSCommandBufferInfo') + let b:VCSCommandBufferInfo = s:cvsFunctions.GetBufferInfo() + endif + + if len(b:VCSCommandBufferInfo) > 0 + return b:VCSCommandBufferInfo[0] + else + return '' + endif endfunction " Section: VCS function implementations {{{1 " Function: s:cvsFunctions.Identify(buffer) {{{2 function! s:cvsFunctions.Identify(buffer) - let fileName = resolve(bufname(a:buffer)) - if isdirectory(fileName) - let directoryName = fileName - else - let directoryName = fnamemodify(fileName, ':h') - endif - if strlen(directoryName) > 0 - let CVSRoot = directoryName . '/CVS/Root' - else - let CVSRoot = 'CVS/Root' - endif - if filereadable(CVSRoot) - return 1 - else - return 0 - endif + let fileName = resolve(bufname(a:buffer)) + if isdirectory(fileName) + let directoryName = fileName + else + let directoryName = fnamemodify(fileName, ':h') + endif + if strlen(directoryName) > 0 + let CVSRoot = directoryName . '/CVS/Root' + else + let CVSRoot = 'CVS/Root' + endif + if filereadable(CVSRoot) + return 1 + else + return 0 + endif endfunction " Function: s:cvsFunctions.Add(argList) {{{2 function! s:cvsFunctions.Add(argList) - return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' ')) + return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' '), {}) endfunction " Function: s:cvsFunctions.Annotate(argList) {{{2 function! s:cvsFunctions.Annotate(argList) - if len(a:argList) == 0 - if &filetype == 'CVSAnnotate' - " This is a CVSAnnotate buffer. Perform annotation of the version - " indicated by the current line. - let caption = matchstr(getline('.'),'\v^[0-9.]+') - - if VCSCommandGetOption('VCSCommandCVSAnnotateParent', 0) != 0 - if caption != '1.1' - let revmaj = matchstr(caption,'\v[0-9.]+\ze\.[0-9]+') - let revmin = matchstr(caption,'\v[0-9.]+\.\zs[0-9]+') - 1 - if revmin == 0 - " Jump to ancestor branch - let caption = matchstr(revmaj,'\v[0-9.]+\ze\.[0-9]+') - else - let caption = revmaj . "." . revmin - endif - endif - endif - - let options = ['-r' . caption] - else - " CVS defaults to pulling HEAD, regardless of current branch. - " Therefore, always pass desired revision. - let caption = '' - let options = ['-r' . GetRevision()] - endif - elseif len(a:argList) == 1 && a:argList[0] !~ '^-' - let caption = a:argList[0] - let options = ['-r' . caption] - else - let caption = join(a:argList) - let options = a:argList - endif - - let resultBuffer = s:DoCommand(join(['-q', 'annotate'] + options), 'annotate', caption) - if resultBuffer > 0 - set filetype=CVSAnnotate - " Remove header lines from standard error - silent v/^\d\+\%(\.\d\+\)\+/d - endif - return resultBuffer + if len(a:argList) == 0 + if &filetype == 'CVSAnnotate' + " This is a CVSAnnotate buffer. Perform annotation of the version + " indicated by the current line. + let caption = matchstr(getline('.'),'\v^[0-9.]+') + + if VCSCommandGetOption('VCSCommandCVSAnnotateParent', 0) != 0 + if caption != '1.1' + let revmaj = matchstr(caption,'\v[0-9.]+\ze\.[0-9]+') + let revmin = matchstr(caption,'\v[0-9.]+\.\zs[0-9]+') - 1 + if revmin == 0 + " Jump to ancestor branch + let caption = matchstr(revmaj,'\v[0-9.]+\ze\.[0-9]+') + else + let caption = revmaj . "." . revmin + endif + endif + endif + + let options = ['-r' . caption] + else + " CVS defaults to pulling HEAD, regardless of current branch. + " Therefore, always pass desired revision. + let caption = '' + let options = ['-r' . GetRevision()] + endif + elseif len(a:argList) == 1 && a:argList[0] !~ '^-' + let caption = a:argList[0] + let options = ['-r' . caption] + else + let caption = join(a:argList) + let options = a:argList + endif + + let resultBuffer = s:DoCommand(join(['-q', 'annotate'] + options), 'annotate', caption, {}) + if resultBuffer > 0 + set filetype=CVSAnnotate + " Remove header lines from standard error + silent v/^\d\+\%(\.\d\+\)\+/d + endif + return resultBuffer endfunction " Function: s:cvsFunctions.Commit(argList) {{{2 function! s:cvsFunctions.Commit(argList) - let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '') - if resultBuffer == 0 - echomsg 'No commit needed.' - endif - return resultBuffer + let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {}) + if resultBuffer == 0 + echomsg 'No commit needed.' + endif + return resultBuffer endfunction " Function: s:cvsFunctions.Delete() {{{2 " By default, use the -f option to remove the file first. If options are " passed in, use those instead. function! s:cvsFunctions.Delete(argList) - let options = ['-f'] - let caption = '' - if len(a:argList) > 0 - let options = a:argList - let caption = join(a:argList, ' ') - endif - return s:DoCommand(join(['remove'] + options, ' '), 'delete', caption) + let options = ['-f'] + let caption = '' + if len(a:argList) > 0 + let options = a:argList + let caption = join(a:argList, ' ') + endif + return s:DoCommand(join(['remove'] + options, ' '), 'delete', caption, {}) endfunction " Function: s:cvsFunctions.Diff(argList) {{{2 function! s:cvsFunctions.Diff(argList) - if len(a:argList) == 0 - let revOptions = [] - let caption = '' - elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 - let revOptions = ['-r' . join(a:argList, ' -r')] - let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')' - else - " Pass-through - let caption = join(a:argList, ' ') - let revOptions = a:argList - endif - - let cvsDiffOpt = VCSCommandGetOption('VCSCommandCVSDiffOpt', 'u') - if cvsDiffOpt == '' - let diffOptions = [] - else - let diffOptions = ['-' . cvsDiffOpt] - endif - - let resultBuffer = s:DoCommand(join(['diff'] + diffOptions + revOptions), 'diff', caption) - if resultBuffer > 0 - set filetype=diff - else - echomsg 'No differences found' - endif - return resultBuffer + if len(a:argList) == 0 + let revOptions = [] + let caption = '' + elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 + let revOptions = ['-r' . join(a:argList, ' -r')] + let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')' + else + " Pass-through + let caption = join(a:argList, ' ') + let revOptions = a:argList + endif + + let cvsDiffOpt = VCSCommandGetOption('VCSCommandCVSDiffOpt', 'u') + if cvsDiffOpt == '' + let diffOptions = [] + else + let diffOptions = ['-' . cvsDiffOpt] + endif + + let resultBuffer = s:DoCommand(join(['diff'] + diffOptions + revOptions), 'diff', caption, {'allowNonZeroExit': 1}) + if resultBuffer > 0 + set filetype=diff + else + echomsg 'No differences found' + endif + return resultBuffer endfunction " Function: s:cvsFunctions.GetBufferInfo() {{{2 @@ -262,129 +262,129 @@ " Returns: List of results: [revision, repository, branch] function! s:cvsFunctions.GetBufferInfo() - let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) - let fileName = bufname(originalBuffer) - if isdirectory(fileName) - let tag = '' - if filereadable(fileName . '/CVS/Tag') - let tagFile = readfile(fileName . '/CVS/Tag') - if len(tagFile) == 1 - let tag = substitute(tagFile[0], '^T', '', '') - endif - endif - return [tag] - endif - let realFileName = fnamemodify(resolve(fileName), ':t') - if !filereadable(fileName) - return ['Unknown'] - endif - let oldCwd = VCSCommandChangeToCurrentFileDir(fileName) - try - let statusText=system(VCSCommandGetOption('VCSCommandCVSExec', 'cvs') . ' status "' . realFileName . '"') - if(v:shell_error) - return [] - endif - let revision=substitute(statusText, '^\_.*Working revision:\s*\(\d\+\%(\.\d\+\)\+\|New file!\)\_.*$', '\1', '') - - " We can still be in a CVS-controlled directory without this being a CVS - " file - if match(revision, '^New file!$') >= 0 - let revision='New' - elseif match(revision, '^\d\+\.\d\+\%(\.\d\+\.\d\+\)*$') <0 - return ['Unknown'] - endif - - let branch=substitute(statusText, '^\_.*Sticky Tag:\s\+\(\d\+\%(\.\d\+\)\+\|\a[A-Za-z0-9-_]*\|(none)\).*$', '\1', '') - let repository=substitute(statusText, '^\_.*Repository revision:\s*\(\d\+\%(\.\d\+\)\+\|New file!\|No revision control file\)\_.*$', '\1', '') - let repository=substitute(repository, '^New file!\|No revision control file$', 'New', '') - return [revision, repository, branch] - finally - call VCSCommandChdir(oldCwd) - endtry + let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) + let fileName = bufname(originalBuffer) + if isdirectory(fileName) + let tag = '' + if filereadable(fileName . '/CVS/Tag') + let tagFile = readfile(fileName . '/CVS/Tag') + if len(tagFile) == 1 + let tag = substitute(tagFile[0], '^T', '', '') + endif + endif + return [tag] + endif + let realFileName = fnamemodify(resolve(fileName), ':t') + if !filereadable(fileName) + return ['Unknown'] + endif + let oldCwd = VCSCommandChangeToCurrentFileDir(fileName) + try + let statusText=system(VCSCommandGetOption('VCSCommandCVSExec', 'cvs') . ' status "' . realFileName . '"') + if(v:shell_error) + return [] + endif + let revision=substitute(statusText, '^\_.*Working revision:\s*\(\d\+\%(\.\d\+\)\+\|New file!\)\_.*$', '\1', '') + + " We can still be in a CVS-controlled directory without this being a CVS + " file + if match(revision, '^New file!$') >= 0 + let revision='New' + elseif match(revision, '^\d\+\.\d\+\%(\.\d\+\.\d\+\)*$') <0 + return ['Unknown'] + endif + + let branch=substitute(statusText, '^\_.*Sticky Tag:\s\+\(\d\+\%(\.\d\+\)\+\|\a[A-Za-z0-9-_]*\|(none)\).*$', '\1', '') + let repository=substitute(statusText, '^\_.*Repository revision:\s*\(\d\+\%(\.\d\+\)\+\|New file!\|No revision control file\)\_.*$', '\1', '') + let repository=substitute(repository, '^New file!\|No revision control file$', 'New', '') + return [revision, repository, branch] + finally + call VCSCommandChdir(oldCwd) + endtry endfunction " Function: s:cvsFunctions.Log() {{{2 function! s:cvsFunctions.Log(argList) - if len(a:argList) == 0 - let options = [] - let caption = '' - elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 - let options = ['-r' . join(a:argList, ':')] - let caption = options[0] - else - " Pass-through - let options = a:argList - let caption = join(a:argList, ' ') - endif - - let resultBuffer=s:DoCommand(join(['log'] + options), 'log', caption) - if resultBuffer > 0 - set filetype=rcslog - endif - return resultBuffer + if len(a:argList) == 0 + let options = [] + let caption = '' + elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 + let options = ['-r' . join(a:argList, ':')] + let caption = options[0] + else + " Pass-through + let options = a:argList + let caption = join(a:argList, ' ') + endif + + let resultBuffer=s:DoCommand(join(['log'] + options), 'log', caption, {}) + if resultBuffer > 0 + set filetype=rcslog + endif + return resultBuffer endfunction " Function: s:cvsFunctions.Revert(argList) {{{2 function! s:cvsFunctions.Revert(argList) - return s:DoCommand('update -C', 'revert', '') + return s:DoCommand('update -C', 'revert', '', {}) endfunction " Function: s:cvsFunctions.Review(argList) {{{2 function! s:cvsFunctions.Review(argList) - if len(a:argList) == 0 - let versiontag = '(current)' - let versionOption = '' - else - let versiontag = a:argList[0] - let versionOption = ' -r ' . versiontag . ' ' - endif - - let resultBuffer = s:DoCommand('-q update -p' . versionOption, 'review', versiontag) - if resultBuffer > 0 - let &filetype=getbufvar(b:VCSCommandOriginalBuffer, '&filetype') - endif - return resultBuffer + if len(a:argList) == 0 + let versiontag = '(current)' + let versionOption = '' + else + let versiontag = a:argList[0] + let versionOption = ' -r ' . versiontag . ' ' + endif + + let resultBuffer = s:DoCommand('-q update -p' . versionOption, 'review', versiontag, {}) + if resultBuffer > 0 + let &filetype=getbufvar(b:VCSCommandOriginalBuffer, '&filetype') + endif + return resultBuffer endfunction " Function: s:cvsFunctions.Status(argList) {{{2 function! s:cvsFunctions.Status(argList) - return s:DoCommand(join(['status'] + a:argList, ' '), 'status', join(a:argList, ' ')) + return s:DoCommand(join(['status'] + a:argList, ' '), 'status', join(a:argList, ' '), {}) endfunction " Function: s:cvsFunctions.Update(argList) {{{2 function! s:cvsFunctions.Update(argList) - return s:DoCommand('update', 'update', '') + return s:DoCommand('update', 'update', '', {}) endfunction " Section: CVS-specific functions {{{1 " Function: s:CVSEdit() {{{2 function! s:CVSEdit() - return s:DoCommand('edit', 'cvsedit', '') + return s:DoCommand('edit', 'cvsedit', '', {}) endfunction " Function: s:CVSEditors() {{{2 function! s:CVSEditors() - return s:DoCommand('editors', 'cvseditors', '') + return s:DoCommand('editors', 'cvseditors', '', {}) endfunction " Function: s:CVSUnedit() {{{2 function! s:CVSUnedit() - return s:DoCommand('unedit', 'cvsunedit', '') + return s:DoCommand('unedit', 'cvsunedit', '', {}) endfunction " Function: s:CVSWatch(onoff) {{{2 function! s:CVSWatch(onoff) - if a:onoff !~ '^\c\%(on\|off\|add\|remove\)$' - echoerr 'Argument to CVSWatch must be one of [on|off|add|remove]' - return -1 - end - return s:DoCommand('watch ' . tolower(a:onoff), 'cvswatch', '') + if a:onoff !~ '^\c\%(on\|off\|add\|remove\)$' + echoerr 'Argument to CVSWatch must be one of [on|off|add|remove]' + return -1 + end + return s:DoCommand('watch ' . tolower(a:onoff), 'cvswatch', '', {}) endfunction " Function: s:CVSWatchers() {{{2 function! s:CVSWatchers() - return s:DoCommand('watchers', 'cvswatchers', '') + return s:DoCommand('watchers', 'cvswatchers', '', {}) endfunction " Section: Command definitions {{{1 @@ -403,21 +403,21 @@ let s:cvsExtensionMappings = {} let mappingInfo = [ - \['CVSEdit', 'CVSEdit', 'ce'], - \['CVSEditors', 'CVSEditors', 'cE'], - \['CVSUnedit', 'CVSUnedit', 'ct'], - \['CVSWatchers', 'CVSWatchers', 'cwv'], - \['CVSWatchAdd', 'CVSWatch add', 'cwa'], - \['CVSWatchOff', 'CVSWatch off', 'cwf'], - \['CVSWatchOn', 'CVSWatch on', 'cwn'], - \['CVSWatchRemove', 'CVSWatch remove', 'cwr'] - \] + \['CVSEdit', 'CVSEdit', 'ce'], + \['CVSEditors', 'CVSEditors', 'cE'], + \['CVSUnedit', 'CVSUnedit', 'ct'], + \['CVSWatchers', 'CVSWatchers', 'cwv'], + \['CVSWatchAdd', 'CVSWatch add', 'cwa'], + \['CVSWatchOff', 'CVSWatch off', 'cwf'], + \['CVSWatchOn', 'CVSWatch on', 'cwn'], + \['CVSWatchRemove', 'CVSWatch remove', 'cwr'] + \] for [pluginName, commandText, shortCut] in mappingInfo - execute 'nnoremap ' . pluginName . ' :' . commandText . '' - if !hasmapto('' . pluginName) - let s:cvsExtensionMappings[shortCut] = commandText - endif + execute 'nnoremap ' . pluginName . ' :' . commandText . '' + if !hasmapto('' . pluginName) + let s:cvsExtensionMappings[shortCut] = commandText + endif endfor " Section: Menu items {{{1 Modified: trunk/packages/vim-scripts/plugin/vcsgit.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/vcsgit.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/vcsgit.vim (original) +++ trunk/packages/vim-scripts/plugin/vcsgit.vim Tue Apr 8 21:07:01 2008 @@ -45,9 +45,6 @@ finish endif -let s:save_cpo=&cpo -set cpo&vim - runtime plugin/vcscommand.vim if !executable(VCSCommandGetOption('VCSCommandGitExec', 'git')) @@ -55,19 +52,22 @@ finish endif +let s:save_cpo=&cpo +set cpo&vim + " Section: Variable initialization {{{1 let s:gitFunctions = {} " Section: Utility functions {{{1 -" Function: s:DoCommand(cmd, cmdName, statusText) {{{2 +" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2 " Wrapper to VCSCommandDoCommand to add the name of the git executable to the " command argument. -function! s:DoCommand(cmd, cmdName, statusText) +function! s:DoCommand(cmd, cmdName, statusText, options) if VCSCommandGetVCSType(expand('%')) == 'git' - let fullCmd = VCSCommandGetOption('VCSCommandGitExec', 'git') . ' ' . a:cmd - return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText) + let fullCmd = VCSCommandGetOption('VCSCommandGitExec', 'git',) . ' ' . a:cmd + return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options) else throw 'git VCSCommand plugin called on non-git item.' endif @@ -76,6 +76,8 @@ " Section: VCS function implementations {{{1 " Function: s:gitFunctions.Identify(buffer) {{{2 +" This function only returns an inexact match due to the detection method used +" by git, which simply traverses the directory structure upward. function! s:gitFunctions.Identify(buffer) let oldCwd = VCSCommandChangeToCurrentFileDir(resolve(bufname(a:buffer))) try @@ -83,7 +85,7 @@ if(v:shell_error) return 0 else - return 1 + return g:VCSCOMMAND_IDENTIFY_INEXACT endif finally call VCSCommandChdir(oldCwd) @@ -92,7 +94,7 @@ " Function: s:gitFunctions.Add(argList) {{{2 function! s:gitFunctions.Add(argList) - return s:DoCommand(join(['add'] + ['-v'] + a:argList, ' '), 'add', join(a:argList, ' ')) + return s:DoCommand(join(['add'] + ['-v'] + a:argList, ' '), 'add', join(a:argList, ' '), {}) endfunction " Function: s:gitFunctions.Annotate(argList) {{{2 @@ -110,7 +112,7 @@ let options = join(a:argList, ' ') endif - let resultBuffer = s:DoCommand('blame ' . options . ' -- ', 'annotate', options) + let resultBuffer = s:DoCommand('blame ' . options . ' -- ', 'annotate', options, {}) if resultBuffer > 0 normal 1G set filetype=gitAnnotate @@ -120,7 +122,7 @@ " Function: s:gitFunctions.Commit(argList) {{{2 function! s:gitFunctions.Commit(argList) - let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '') + let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {}) if resultBuffer == 0 echomsg 'No commit needed.' endif @@ -132,7 +134,7 @@ function! s:gitFunctions.Delete(argList) let options = a:argList let caption = join(a:argList, ' ') - return s:DoCommand(join(['rm'] + options, ' '), 'delete', caption) + return s:DoCommand(join(['rm'] + options, ' '), 'delete', caption, {}) endfunction " Function: s:gitFunctions.Diff(argList) {{{2 @@ -152,7 +154,7 @@ endfor endif - let resultBuffer = s:DoCommand(join(['diff'] + diffOptions + a:argList), 'diff', join(a:argList)) + let resultBuffer = s:DoCommand(join(['diff'] + diffOptions + a:argList), 'diff', join(a:argList), {}) if resultBuffer > 0 set filetype=diff else @@ -171,9 +173,27 @@ function! s:gitFunctions.GetBufferInfo() let oldCwd = VCSCommandChangeToCurrentFileDir(resolve(bufname('%'))) try - let branch = substitute(system(VCSCommandGetOption('VCSCommandGitExec', 'git') . ' symbolic-ref HEAD'), '\n$', '', '') - let branch = substitute(branch, '^refs/heads/', '', '') - return[branch] + let branch = substitute(system(VCSCommandGetOption('VCSCommandGitExec', 'git') . ' symbolic-ref -q HEAD'), '\n$', '', '') + if v:shell_error + let branch = 'DETACHED' + else + let branch = substitute(branch, '^refs/heads/', '', '') + endif + + let info = [branch] + + for method in split(VCSCommandGetOption('VCSCommandGitDescribeArgList', (',tags,all,always')), ',', 1) + if method != '' + let method = ' --' . method + endif + let tag = substitute(system(VCSCommandGetOption('VCSCommandGitExec', 'git') . ' describe' . method), '\n$', '', '') + if !v:shell_error + call add(info, tag) + break + endif + endfor + + return info finally call VCSCommandChdir(oldCwd) endtry @@ -181,7 +201,7 @@ " Function: s:gitFunctions.Log() {{{2 function! s:gitFunctions.Log(argList) - let resultBuffer=s:DoCommand(join(['log'] + a:argList), 'log', join(a:argList, ' ')) + let resultBuffer=s:DoCommand(join(['log'] + a:argList), 'log', join(a:argList, ' '), {}) if resultBuffer > 0 set filetype=gitlog endif @@ -190,7 +210,7 @@ " Function: s:gitFunctions.Revert(argList) {{{2 function! s:gitFunctions.Revert(argList) - return s:DoCommand('checkout', 'revert', '') + return s:DoCommand('checkout', 'revert', '', {}) endfunction " Function: s:gitFunctions.Review(argList) {{{2 @@ -210,7 +230,7 @@ let prefix = substitute(prefix, '\n$', '', '') let blob = revision . ':' . prefix . '' - let resultBuffer = s:DoCommand('show ' . blob, 'review', revision) + let resultBuffer = s:DoCommand('show ' . blob, 'review', revision, {}) if resultBuffer > 0 let &filetype=getbufvar(b:VCSCommandOriginalBuffer, '&filetype') endif @@ -219,7 +239,7 @@ " Function: s:gitFunctions.Status(argList) {{{2 function! s:gitFunctions.Status(argList) - throw "This command is not implemented for git. If you have an idea for what it should do, please let me know." + return s:DoCommand(join(['status'] + a:argList), 'log', join(a:argList), {'allowNonZeroExit': 1}) endfunction " Function: s:gitFunctions.Update(argList) {{{2 Modified: trunk/packages/vim-scripts/plugin/vcssvk.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/vcssvk.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/vcssvk.vim (original) +++ trunk/packages/vim-scripts/plugin/vcssvk.vim Tue Apr 8 21:07:01 2008 @@ -36,122 +36,122 @@ " Section: Plugin header {{{1 if v:version < 700 - echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None - finish + echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None + finish +endif + +runtime plugin/vcscommand.vim + +if !executable(VCSCommandGetOption('VCSCommandSVKExec', 'svk')) + " SVK is not installed + finish endif let s:save_cpo=&cpo set cpo&vim -runtime plugin/vcscommand.vim - -if !executable(VCSCommandGetOption('VCSCommandSVKExec', 'svk')) - " SVK is not installed - finish -endif - " Section: Variable initialization {{{1 let s:svkFunctions = {} " Section: Utility functions {{{1 -" Function: s:DoCommand(cmd, cmdName, statusText) {{{2 +" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2 " Wrapper to VCSCommandDoCommand to add the name of the SVK executable to the " command argument. -function! s:DoCommand(cmd, cmdName, statusText) - if VCSCommandGetVCSType(expand('%')) == 'SVK' - let fullCmd = VCSCommandGetOption('VCSCommandSVKExec', 'svk') . ' ' . a:cmd - return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText) - else - throw 'SVK VCSCommand plugin called on non-SVK item.' - endif +function! s:DoCommand(cmd, cmdName, statusText, options) + if VCSCommandGetVCSType(expand('%')) == 'SVK' + let fullCmd = VCSCommandGetOption('VCSCommandSVKExec', 'svk') . ' ' . a:cmd + return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options) + else + throw 'SVK VCSCommand plugin called on non-SVK item.' + endif endfunction " Section: VCS function implementations {{{1 " Function: s:svkFunctions.Identify(buffer) {{{2 function! s:svkFunctions.Identify(buffer) - let fileName = resolve(bufname(a:buffer)) - if isdirectory(fileName) - let directoryName = fileName - else - let directoryName = fnamemodify(fileName, ':p:h') - endif - let statusText = system(VCSCommandGetOption('VCSCommandSVKExec', 'svk') . ' info "' . directoryName . '"') - if(v:shell_error) - return 0 - else - return 1 - endif + let fileName = resolve(bufname(a:buffer)) + if isdirectory(fileName) + let directoryName = fileName + else + let directoryName = fnamemodify(fileName, ':p:h') + endif + let statusText = system(VCSCommandGetOption('VCSCommandSVKExec', 'svk') . ' info "' . directoryName . '"') + if(v:shell_error) + return 0 + else + return 1 + endif endfunction " Function: s:svkFunctions.Add() {{{2 function! s:svkFunctions.Add(argList) - return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' ')) + return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' '), {}) endfunction " Function: s:svkFunctions.Annotate(argList) {{{2 function! s:svkFunctions.Annotate(argList) - if len(a:argList) == 0 - if &filetype == 'SVKAnnotate' - " Perform annotation of the version indicated by the current line. - let caption = matchstr(getline('.'),'\v^\s+\zs\d+') - let options = ' -r' . caption - else - let caption = '' - let options = '' - endif - elseif len(a:argList) == 1 && a:argList[0] !~ '^-' - let caption = a:argList[0] - let options = ' -r' . caption - else - let caption = join(a:argList, ' ') - let options = ' ' . caption - endif - - let resultBuffer = s:DoCommand('blame' . options, 'annotate', caption) - if resultBuffer > 0 - normal 1G2dd - set filetype=SVKAnnotate - endif - return resultBuffer + if len(a:argList) == 0 + if &filetype == 'SVKAnnotate' + " Perform annotation of the version indicated by the current line. + let caption = matchstr(getline('.'),'\v^\s+\zs\d+') + let options = ' -r' . caption + else + let caption = '' + let options = '' + endif + elseif len(a:argList) == 1 && a:argList[0] !~ '^-' + let caption = a:argList[0] + let options = ' -r' . caption + else + let caption = join(a:argList, ' ') + let options = ' ' . caption + endif + + let resultBuffer = s:DoCommand('blame' . options, 'annotate', caption, {}) + if resultBuffer > 0 + normal 1G2dd + set filetype=SVKAnnotate + endif + return resultBuffer endfunction " Function: s:svkFunctions.Commit(argList) {{{2 function! s:svkFunctions.Commit(argList) - let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '') - if resultBuffer == 0 - echomsg 'No commit needed.' - endif + let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {}) + if resultBuffer == 0 + echomsg 'No commit needed.' + endif endfunction " Function: s:svkFunctions.Delete() {{{2 function! s:svkFunctions.Delete(argList) - return s:DoCommand(join(['delete'] + a:argList, ' '), 'delete', join(a:argList, ' ')) + return s:DoCommand(join(['delete'] + a:argList, ' '), 'delete', join(a:argList, ' '), {}) endfunction " Function: s:svkFunctions.Diff(argList) {{{2 function! s:svkFunctions.Diff(argList) - if len(a:argList) == 0 - let revOptions = [] - let caption = '' - elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 - let revOptions = ['-r' . join(a:argList, ':')] - let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')' - else - " Pass-through - let caption = join(a:argList, ' ') - let revOptions = a:argList - endif - - let resultBuffer = s:DoCommand(join(['diff'] + revOptions), 'diff', caption) - if resultBuffer > 0 - set filetype=diff - else - echomsg 'No differences found' - endif - return resultBuffer + if len(a:argList) == 0 + let revOptions = [] + let caption = '' + elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 + let revOptions = ['-r' . join(a:argList, ':')] + let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')' + else + " Pass-through + let caption = join(a:argList, ' ') + let revOptions = a:argList + endif + + let resultBuffer = s:DoCommand(join(['diff'] + revOptions), 'diff', caption, {}) + if resultBuffer > 0 + set filetype=diff + else + echomsg 'No differences found' + endif + return resultBuffer endfunction " Function: s:svkFunctions.GetBufferInfo() {{{2 @@ -161,95 +161,95 @@ " Returns: List of results: [revision, repository] function! s:svkFunctions.GetBufferInfo() - let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) - let fileName = resolve(bufname(originalBuffer)) - let statusText = system(VCSCommandGetOption('VCSCommandSVKExec', 'svk') . ' status -v "' . fileName . '"') - if(v:shell_error) - return [] - endif - - " File not under SVK control. - if statusText =~ '^?' - return ['Unknown'] - endif - - let [flags, revision, repository] = matchlist(statusText, '^\(.\{3}\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s')[1:3] - if revision == '' - " Error - return ['Unknown'] - elseif flags =~ '^A' - return ['New', 'New'] - else - return [revision, repository] - endif + let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) + let fileName = resolve(bufname(originalBuffer)) + let statusText = system(VCSCommandGetOption('VCSCommandSVKExec', 'svk') . ' status -v "' . fileName . '"') + if(v:shell_error) + return [] + endif + + " File not under SVK control. + if statusText =~ '^?' + return ['Unknown'] + endif + + let [flags, revision, repository] = matchlist(statusText, '^\(.\{3}\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s')[1:3] + if revision == '' + " Error + return ['Unknown'] + elseif flags =~ '^A' + return ['New', 'New'] + else + return [revision, repository] + endif endfunction " Function: s:svkFunctions.Info(argList) {{{2 function! s:svkFunctions.Info(argList) - return s:DoCommand(join(['info'] + a:argList, ' '), 'info', join(a:argList, ' ')) + return s:DoCommand(join(['info'] + a:argList, ' '), 'info', join(a:argList, ' '), {}) endfunction " Function: s:svkFunctions.Lock(argList) {{{2 function! s:svkFunctions.Lock(argList) - return s:DoCommand(join(['lock'] + a:argList, ' '), 'lock', join(a:argList, ' ')) + return s:DoCommand(join(['lock'] + a:argList, ' '), 'lock', join(a:argList, ' '), {}) endfunction " Function: s:svkFunctions.Log() {{{2 function! s:svkFunctions.Log(argList) - if len(a:argList) == 0 - let options = [] - let caption = '' - elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 - let options = ['-r' . join(a:argList, ':')] - let caption = options[0] - else - " Pass-through - let options = a:argList - let caption = join(a:argList, ' ') - endif - - let resultBuffer = s:DoCommand(join(['log', '-v'] + options), 'log', caption) - return resultBuffer + if len(a:argList) == 0 + let options = [] + let caption = '' + elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 + let options = ['-r' . join(a:argList, ':')] + let caption = options[0] + else + " Pass-through + let options = a:argList + let caption = join(a:argList, ' ') + endif + + let resultBuffer = s:DoCommand(join(['log', '-v'] + options), 'log', caption, {}) + return resultBuffer endfunction " Function: s:svkFunctions.Revert(argList) {{{2 function! s:svkFunctions.Revert(argList) - return s:DoCommand('revert', 'revert', '') + return s:DoCommand('revert', 'revert', '', {}) endfunction " Function: s:svkFunctions.Review(argList) {{{2 function! s:svkFunctions.Review(argList) - if len(a:argList) == 0 - let versiontag = '(current)' - let versionOption = '' - else - let versiontag = a:argList[0] - let versionOption = ' -r ' . versiontag . ' ' - endif - - let resultBuffer = s:DoCommand('cat' . versionOption, 'review', versiontag) - if resultBuffer > 0 - let &filetype=getbufvar(b:VCSCommandOriginalBuffer, '&filetype') - endif - return resultBuffer + if len(a:argList) == 0 + let versiontag = '(current)' + let versionOption = '' + else + let versiontag = a:argList[0] + let versionOption = ' -r ' . versiontag . ' ' + endif + + let resultBuffer = s:DoCommand('cat' . versionOption, 'review', versiontag, {}) + if resultBuffer > 0 + let &filetype=getbufvar(b:VCSCommandOriginalBuffer, '&filetype') + endif + return resultBuffer endfunction " Function: s:svkFunctions.Status(argList) {{{2 function! s:svkFunctions.Status(argList) - let options = ['-v'] - if len(a:argList) == 0 - let options = a:argList - endif - return s:DoCommand(join(['status'] + options, ' '), 'status', join(options, ' ')) + let options = ['-v'] + if len(a:argList) == 0 + let options = a:argList + endif + return s:DoCommand(join(['status'] + options, ' '), 'status', join(options, ' '), {}) endfunction " Function: s:svkFunctions.Unlock(argList) {{{2 function! s:svkFunctions.Unlock(argList) - return s:DoCommand(join(['unlock'] + a:argList, ' '), 'unlock', join(a:argList, ' ')) + return s:DoCommand(join(['unlock'] + a:argList, ' '), 'unlock', join(a:argList, ' '), {}) endfunction " Function: s:svkFunctions.Update(argList) {{{2 function! s:svkFunctions.Update(argList) - return s:DoCommand('update', 'update', '') + return s:DoCommand('update', 'update', '', {}) endfunction " Section: Plugin Registration {{{1 Modified: trunk/packages/vim-scripts/plugin/vcssvn.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/vcssvn.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/vcssvn.vim (original) +++ trunk/packages/vim-scripts/plugin/vcssvn.vim Tue Apr 8 21:07:01 2008 @@ -43,141 +43,141 @@ " Section: Plugin header {{{1 if v:version < 700 - echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None - finish + echohl WarningMsg|echomsg 'VCSCommand requires at least VIM 7.0'|echohl None + finish +endif + +runtime plugin/vcscommand.vim + +if !executable(VCSCommandGetOption('VCSCommandSVNExec', 'svn')) + " SVN is not installed + finish endif let s:save_cpo=&cpo set cpo&vim -runtime plugin/vcscommand.vim - -if !executable(VCSCommandGetOption('VCSCommandSVNExec', 'svn')) - " SVN is not installed - finish -endif - " Section: Variable initialization {{{1 let s:svnFunctions = {} " Section: Utility functions {{{1 -" Function: s:DoCommand(cmd, cmdName, statusText) {{{2 +" Function: s:DoCommand(cmd, cmdName, statusText, options) {{{2 " Wrapper to VCSCommandDoCommand to add the name of the SVN executable to the " command argument. -function! s:DoCommand(cmd, cmdName, statusText) - if VCSCommandGetVCSType(expand('%')) == 'SVN' - let fullCmd = VCSCommandGetOption('VCSCommandSVNExec', 'svn') . ' ' . a:cmd - return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText) - else - throw 'SVN VCSCommand plugin called on non-SVN item.' - endif +function! s:DoCommand(cmd, cmdName, statusText, options) + if VCSCommandGetVCSType(expand('%')) == 'SVN' + let fullCmd = VCSCommandGetOption('VCSCommandSVNExec', 'svn') . ' ' . a:cmd + return VCSCommandDoCommand(fullCmd, a:cmdName, a:statusText, a:options) + else + throw 'SVN VCSCommand plugin called on non-SVN item.' + endif endfunction " Section: VCS function implementations {{{1 " Function: s:svnFunctions.Identify(buffer) {{{2 function! s:svnFunctions.Identify(buffer) - let fileName = resolve(bufname(a:buffer)) - if isdirectory(fileName) - let directoryName = fileName - else - let directoryName = fnamemodify(fileName, ':h') - endif - if strlen(directoryName) > 0 - let svnDir = directoryName . '/.svn' - else - let svnDir = '.svn' - endif - if isdirectory(svnDir) - return 1 - else - return 0 - endif + let fileName = resolve(bufname(a:buffer)) + if isdirectory(fileName) + let directoryName = fileName + else + let directoryName = fnamemodify(fileName, ':h') + endif + if strlen(directoryName) > 0 + let svnDir = directoryName . '/.svn' + else + let svnDir = '.svn' + endif + if isdirectory(svnDir) + return 1 + else + return 0 + endif endfunction " Function: s:svnFunctions.Add() {{{2 function! s:svnFunctions.Add(argList) - return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' ')) + return s:DoCommand(join(['add'] + a:argList, ' '), 'add', join(a:argList, ' '), {}) endfunction " Function: s:svnFunctions.Annotate(argList) {{{2 function! s:svnFunctions.Annotate(argList) - if len(a:argList) == 0 - if &filetype == 'SVNAnnotate' - " Perform annotation of the version indicated by the current line. - let caption = matchstr(getline('.'),'\v^\s+\zs\d+') - let options = ' -r' . caption - else - let caption = '' - let options = '' - endif - elseif len(a:argList) == 1 && a:argList[0] !~ '^-' - let caption = a:argList[0] - let options = ' -r' . caption - else - let caption = join(a:argList, ' ') - let options = ' ' . caption - endif - - let resultBuffer = s:DoCommand('blame' . options, 'annotate', caption) - if resultBuffer > 0 - set filetype=SVNAnnotate - endif - return resultBuffer + if len(a:argList) == 0 + if &filetype == 'SVNAnnotate' + " Perform annotation of the version indicated by the current line. + let caption = matchstr(getline('.'),'\v^\s+\zs\d+') + let options = ' -r' . caption + else + let caption = '' + let options = '' + endif + elseif len(a:argList) == 1 && a:argList[0] !~ '^-' + let caption = a:argList[0] + let options = ' -r' . caption + else + let caption = join(a:argList, ' ') + let options = ' ' . caption + endif + + let resultBuffer = s:DoCommand('blame' . options, 'annotate', caption, {}) + if resultBuffer > 0 + set filetype=SVNAnnotate + endif + return resultBuffer endfunction " Function: s:svnFunctions.Commit(argList) {{{2 function! s:svnFunctions.Commit(argList) - let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '') - if resultBuffer == 0 - echomsg 'No commit needed.' - endif + let resultBuffer = s:DoCommand('commit -F "' . a:argList[0] . '"', 'commit', '', {}) + if resultBuffer == 0 + echomsg 'No commit needed.' + endif endfunction " Function: s:svnFunctions.Delete() {{{2 function! s:svnFunctions.Delete(argList) - return s:DoCommand(join(['delete'] + a:argList, ' '), 'delete', join(a:argList, ' ')) + return s:DoCommand(join(['delete'] + a:argList, ' '), 'delete', join(a:argList, ' '), {}) endfunction " Function: s:svnFunctions.Diff(argList) {{{2 function! s:svnFunctions.Diff(argList) - if len(a:argList) == 0 - let revOptions = [] - let caption = '' - elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 - let revOptions = ['-r' . join(a:argList, ':')] - let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')' - else - " Pass-through - let caption = join(a:argList, ' ') - let revOptions = a:argList - endif - - let svnDiffExt = VCSCommandGetOption('VCSCommandSVNDiffExt', '') - if svnDiffExt == '' - let diffExt = [] - else - let diffExt = ['--diff-cmd ' . svnDiffExt] - endif - - let svnDiffOpt = VCSCommandGetOption('VCSCommandSVNDiffOpt', '') - if svnDiffOpt == '' - let diffOptions = [] - else - let diffOptions = ['-x -' . svnDiffOpt] - endif - - let resultBuffer = s:DoCommand(join(['diff'] + diffExt + diffOptions + revOptions), 'diff', caption) - if resultBuffer > 0 - set filetype=diff - else - if svnDiffExt == '' - echomsg 'No differences found' - endif - endif - return resultBuffer + if len(a:argList) == 0 + let revOptions = [] + let caption = '' + elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 + let revOptions = ['-r' . join(a:argList, ':')] + let caption = '(' . a:argList[0] . ' : ' . get(a:argList, 1, 'current') . ')' + else + " Pass-through + let caption = join(a:argList, ' ') + let revOptions = a:argList + endif + + let svnDiffExt = VCSCommandGetOption('VCSCommandSVNDiffExt', '') + if svnDiffExt == '' + let diffExt = [] + else + let diffExt = ['--diff-cmd ' . svnDiffExt] + endif + + let svnDiffOpt = VCSCommandGetOption('VCSCommandSVNDiffOpt', '') + if svnDiffOpt == '' + let diffOptions = [] + else + let diffOptions = ['-x -' . svnDiffOpt] + endif + + let resultBuffer = s:DoCommand(join(['diff'] + diffExt + diffOptions + revOptions), 'diff', caption, {}) + if resultBuffer > 0 + set filetype=diff + else + if svnDiffExt == '' + echomsg 'No differences found' + endif + endif + return resultBuffer endfunction " Function: s:svnFunctions.GetBufferInfo() {{{2 @@ -187,95 +187,95 @@ " Returns: List of results: [revision, repository, branch] function! s:svnFunctions.GetBufferInfo() - let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) - let fileName = bufname(originalBuffer) - let statusText = system(VCSCommandGetOption('VCSCommandSVNExec', 'svn') . ' status -vu "' . fileName . '"') - if(v:shell_error) - return [] - endif - - " File not under SVN control. - if statusText =~ '^?' - return ['Unknown'] - endif - - let [flags, revision, repository] = matchlist(statusText, '^\(.\{8}\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s')[1:3] - if revision == '' - " Error - return ['Unknown'] - elseif flags =~ '^A' - return ['New', 'New'] - else - return [revision, repository] - endif + let originalBuffer = VCSCommandGetOriginalBuffer(bufnr('%')) + let fileName = bufname(originalBuffer) + let statusText = system(VCSCommandGetOption('VCSCommandSVNExec', 'svn') . ' status -vu "' . fileName . '"') + if(v:shell_error) + return [] + endif + + " File not under SVN control. + if statusText =~ '^?' + return ['Unknown'] + endif + + let [flags, revision, repository] = matchlist(statusText, '^\(.\{8}\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s')[1:3] + if revision == '' + " Error + return ['Unknown'] + elseif flags =~ '^A' + return ['New', 'New'] + else + return [revision, repository] + endif endfunction " Function: s:svnFunctions.Info(argList) {{{2 function! s:svnFunctions.Info(argList) - return s:DoCommand(join(['info'] + a:argList, ' '), 'info', join(a:argList, ' ')) + return s:DoCommand(join(['info'] + a:argList, ' '), 'info', join(a:argList, ' '), {}) endfunction " Function: s:svnFunctions.Lock(argList) {{{2 function! s:svnFunctions.Lock(argList) - return s:DoCommand(join(['lock'] + a:argList, ' '), 'lock', join(a:argList, ' ')) + return s:DoCommand(join(['lock'] + a:argList, ' '), 'lock', join(a:argList, ' '), {}) endfunction " Function: s:svnFunctions.Log(argList) {{{2 function! s:svnFunctions.Log(argList) - if len(a:argList) == 0 - let options = [] - let caption = '' - elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 - let options = ['-r' . join(a:argList, ':')] - let caption = options[0] - else - " Pass-through - let options = a:argList - let caption = join(a:argList, ' ') - endif - - let resultBuffer = s:DoCommand(join(['log', '-v'] + options), 'log', caption) - return resultBuffer + if len(a:argList) == 0 + let options = [] + let caption = '' + elseif len(a:argList) <= 2 && match(a:argList, '^-') == -1 + let options = ['-r' . join(a:argList, ':')] + let caption = options[0] + else + " Pass-through + let options = a:argList + let caption = join(a:argList, ' ') + endif + + let resultBuffer = s:DoCommand(join(['log', '-v'] + options), 'log', caption, {}) + return resultBuffer endfunction " Function: s:svnFunctions.Revert(argList) {{{2 function! s:svnFunctions.Revert(argList) - return s:DoCommand('revert', 'revert', '') + return s:DoCommand('revert', 'revert', '', {}) endfunction " Function: s:svnFunctions.Review(argList) {{{2 function! s:svnFunctions.Review(argList) - if len(a:argList) == 0 - let versiontag = '(current)' - let versionOption = '' - else - let versiontag = a:argList[0] - let versionOption = ' -r ' . versiontag . ' ' - endif - - let resultBuffer = s:DoCommand('cat' . versionOption, 'review', versiontag) - if resultBuffer > 0 - let &filetype = getbufvar(b:VCSCommandOriginalBuffer, '&filetype') - endif - return resultBuffer + if len(a:argList) == 0 + let versiontag = '(current)' + let versionOption = '' + else + let versiontag = a:argList[0] + let versionOption = ' -r ' . versiontag . ' ' + endif + + let resultBuffer = s:DoCommand('cat' . versionOption, 'review', versiontag, {}) + if resultBuffer > 0 + let &filetype = getbufvar(b:VCSCommandOriginalBuffer, '&filetype') + endif + return resultBuffer endfunction " Function: s:svnFunctions.Status(argList) {{{2 function! s:svnFunctions.Status(argList) - let options = ['-u', '-v'] - if len(a:argList) == 0 - let options = a:argList - endif - return s:DoCommand(join(['status'] + options, ' '), 'status', join(options, ' ')) + let options = ['-u', '-v'] + if len(a:argList) == 0 + let options = a:argList + endif + return s:DoCommand(join(['status'] + options, ' '), 'status', join(options, ' '), {}) endfunction " Function: s:svnFunctions.Unlock(argList) {{{2 function! s:svnFunctions.Unlock(argList) - return s:DoCommand(join(['unlock'] + a:argList, ' '), 'unlock', join(a:argList, ' ')) + return s:DoCommand(join(['unlock'] + a:argList, ' '), 'unlock', join(a:argList, ' '), {}) endfunction " Function: s:svnFunctions.Update(argList) {{{2 function! s:svnFunctions.Update(argList) - return s:DoCommand('update', 'update', '') + return s:DoCommand('update', 'update', '', {}) endfunction " Section: Plugin Registration {{{1 Modified: trunk/packages/vim-scripts/syntax/CVSAnnotate.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/syntax/CVSAnnotate.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/syntax/CVSAnnotate.vim (original) +++ trunk/packages/vim-scripts/syntax/CVSAnnotate.vim Tue Apr 8 21:07:01 2008 @@ -25,9 +25,9 @@ " IN THE SOFTWARE. if version < 600 - syntax clear + syntax clear elseif exists("b:current_syntax") - finish + finish endif syn match cvsDate /\d\d-...-\d\d/ contained @@ -36,10 +36,10 @@ syn region cvsHead start="^\d\+\.\d\+" end="):" contains=cvsVer,cvsName,cvsDate if !exists("did_cvsannotate_syntax_inits") -let did_cvsannotate_syntax_inits = 1 -hi link cvsDate Comment -hi link cvsName Type -hi link cvsVer Statement + let did_cvsannotate_syntax_inits = 1 + hi link cvsDate Comment + hi link cvsName Type + hi link cvsVer Statement endif let b:current_syntax="CVSAnnotate" Modified: trunk/packages/vim-scripts/syntax/SVKAnnotate.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/syntax/SVKAnnotate.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/syntax/SVKAnnotate.vim (original) +++ trunk/packages/vim-scripts/syntax/SVKAnnotate.vim Tue Apr 8 21:07:01 2008 @@ -24,7 +24,7 @@ " IN THE SOFTWARE. if exists("b:current_syntax") - finish + finish endif syn match svkDate /\d\{4}-\d\{1,2}-\d\{1,2}/ skipwhite contained @@ -33,10 +33,10 @@ syn region svkHead start=/^/ end="):" contains=svkVer,svkName,svkDate oneline if !exists("did_svkannotate_syntax_inits") - let did_svkannotate_syntax_inits = 1 - hi link svkName Type - hi link svkDate Comment - hi link svkVer Statement + let did_svkannotate_syntax_inits = 1 + hi link svkName Type + hi link svkDate Comment + hi link svkVer Statement endif let b:current_syntax="svkAnnotate" Modified: trunk/packages/vim-scripts/syntax/SVNAnnotate.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/syntax/SVNAnnotate.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/syntax/SVNAnnotate.vim (original) +++ trunk/packages/vim-scripts/syntax/SVNAnnotate.vim Tue Apr 8 21:07:01 2008 @@ -24,7 +24,7 @@ " IN THE SOFTWARE. if exists("b:current_syntax") - finish + finish endif syn match svnName /\S\+/ contained @@ -32,9 +32,9 @@ syn match svnHead /^\s\+\d\+\s\+\S\+/ contains=svnVer,svnName if !exists("did_svnannotate_syntax_inits") - let did_svnannotate_syntax_inits = 1 - hi link svnName Type - hi link svnVer Statement + let did_svnannotate_syntax_inits = 1 + hi link svnName Type + hi link svnVer Statement endif let b:current_syntax="svnAnnotate" Modified: trunk/packages/vim-scripts/syntax/vcscommit.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/syntax/vcscommit.vim?rev=1244&op=diff ============================================================================== --- trunk/packages/vim-scripts/syntax/vcscommit.vim (original) +++ trunk/packages/vim-scripts/syntax/vcscommit.vim Tue Apr 8 21:07:01 2008 @@ -23,7 +23,7 @@ " IN THE SOFTWARE. if exists("b:current_syntax") - finish + finish endif syntax region vcsComment start="^VCS: " end="$" From jamessan at users.alioth.debian.org Tue Apr 8 21:13:18 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 21:13:18 -0000 Subject: r1245 - in /trunk/packages/vim-scripts: debian/changelog debian/vim-scripts.status html/index.html html/plugin_calendar.vim.html plugin/calendar.vim Message-ID: Author: jamessan Date: Tue Apr 8 21:13:18 2008 New Revision: 1245 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1245 Log: Update calendar Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/html/index.html trunk/packages/vim-scripts/html/plugin_calendar.vim.html trunk/packages/vim-scripts/plugin/calendar.vim Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1245&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Tue Apr 8 21:13:18 2008 @@ -8,7 +8,7 @@ (Closes: #465330) * Updated addons: - xmledit, surround, debPlugin, Markdown syntax, NERD Commenter, Enhanced - Commentify, vcscommand. + Commentify, vcscommand, calendar. * New addons: - DetectIndent: Automatically detect indent settings. (Closes: #471890) Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1245&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Tue Apr 8 21:13:18 2008 @@ -92,7 +92,7 @@ email: mattn_jp at mail.goo.ne.jp license: no license disabledby: let loaded_calendar = 1 -version: 1.6 +version: 1.7 script_name: plugin/winmanager.vim addon: winmanager Modified: trunk/packages/vim-scripts/html/index.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1245&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/index.html (original) +++ trunk/packages/vim-scripts/html/index.html Tue Apr 8 21:13:18 2008 @@ -49,7 +49,7 @@

  • syntax/mkd.vim.html
  • - Page generated on Tue, 08 Apr 2008 16:51:55 -0400 + Page generated on Tue, 08 Apr 2008 17:12:45 -0400 .

    Modified: trunk/packages/vim-scripts/html/plugin_calendar.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_calendar.vim.html?rev=1245&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/plugin_calendar.vim.html (original) +++ trunk/packages/vim-scripts/html/plugin_calendar.vim.html Tue Apr 8 21:13:18 2008 @@ -153,8 +153,8 @@  script karma  - Rating 1111/455, - Downloaded by 18192 + Rating 1147/470, + Downloaded by 19392

    @@ -204,36 +204,44 @@ release notes - calendar.vim - 1.6 - 2007-07-24 + calendar.vim + 1.7 + 2008-02-15 6.0 Yasuhiro Matsumoto - Added new actions 'calendar_begin' and 'calenader_end'. - - - calendar.vim - 1.5 - 2007-05-01 + This is a fixed version of calendar.vim. fixed problem of week number on 03/01/2008. + + + calendar.vim + 1.6 + 2007-07-24 6.0 Yasuhiro Matsumoto - This is an upgrade for calendar.vim. this include some bug fix. - - - calendar.vim - 1.4a - 2006-01-16 + Added new actions 'calendar_begin' and 'calenader_end'. + + + calendar.vim + 1.5 + 2007-05-01 6.0 Yasuhiro Matsumoto - This is an upgrade for calendar.vim. this include some bug fix and calendar_today action.
    - - - calendar.vim - 1.4 - 2004-11-03 + This is an upgrade for calendar.vim. this include some bug fix. + + + calendar.vim + 1.4a + 2006-01-16 6.0 Yasuhiro Matsumoto - This is an upgrade for Calendar.vim. this include 2 bug fixs and 1 improvement. + This is an upgrade for calendar.vim. this include some bug fix and calendar_today action.
    + + + calendar.vim + 1.4 + 2004-11-03 + 6.0 + Yasuhiro Matsumoto + This is an upgrade for Calendar.vim. this include 2 bug fixs and 1 improvement. @@ -279,8 +287,7 @@ - Sponsored by Web Concept Group Inc. - SourceForge.net Logo + SourceForge.net Logo Modified: trunk/packages/vim-scripts/plugin/calendar.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/calendar.vim?rev=1245&op=diff ============================================================================== --- trunk/packages/vim-scripts/plugin/calendar.vim (original) +++ trunk/packages/vim-scripts/plugin/calendar.vim Tue Apr 8 21:13:18 2008 @@ -2,9 +2,10 @@ " What Is This: Calendar " File: calendar.vim " Author: Yasuhiro Matsumoto -" Last Change: Wed, 25 Jul 2007 -" Version: 1.6 +" Last Change: Fri, 15 Feb 2008 +" Version: 1.7 " Thanks: +" Per Winkvist : bug fix " Serge (gentoosiast) Koksharov : bug fix " Vitor Antunes : bug fix " Olivier Mengue : bug fix @@ -52,11 +53,12 @@ " ch " show horizontal calendar ... " ChangeLog: +" 1.7 : bug fix, week number was broken on 2008. " 1.6 : added calendar_begin action. " added calendar_end action. " 1.5 : bug fix, fixed ruler formating with strpart. " bug fix, using winfixheight. -" 1.4a : bug fix, week numbenr was broken on 2005. +" 1.4a : bug fix, week number was broken on 2005. " added calendar_today action. " bug fix, about wrapscan. " bug fix, about today mark. @@ -301,7 +303,7 @@ " :echo calendar_version " GetLatestVimScripts: 52 1 :AutoInstall: calendar.vim -let g:calendar_version = "1.6" +let g:calendar_version = "1.7" if &compatible finish endif @@ -503,7 +505,7 @@ "+++ ready for build "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ " remember today - " divide strftime('%d') by 1 so as to get "1, 2,3 .. 9" instead of "01, 02, 03 .. 09" + " divide strftime('%d') by 1 so as to get "1,2,3 .. 9" instead of "01, 02, 03 .. 09" let vtoday = strftime('%Y').strftime('%m').strftime('%d') " get arguments @@ -556,76 +558,84 @@ " set boundary of the month if vmnth == 1 let vmdays = 31 - let vparam = 0 + let vparam = 1 let vsmnth = 'Jan' elseif vmnth == 2 let vmdays = 28 - let vparam = 31 + let vparam = 32 let vsmnth = 'Feb' elseif vmnth == 3 let vmdays = 31 - let vparam = 59 + let vparam = 60 let vsmnth = 'Mar' elseif vmnth == 4 let vmdays = 30 - let vparam = 90 + let vparam = 91 let vsmnth = 'Apr' elseif vmnth == 5 let vmdays = 31 - let vparam = 120 + let vparam = 121 let vsmnth = 'May' elseif vmnth == 6 let vmdays = 30 - let vparam = 151 + let vparam = 152 let vsmnth = 'Jun' elseif vmnth == 7 let vmdays = 31 - let vparam = 181 + let vparam = 182 let vsmnth = 'Jul' elseif vmnth == 8 let vmdays = 31 - let vparam = 212 + let vparam = 213 let vsmnth = 'Aug' elseif vmnth == 9 let vmdays = 30 - let vparam = 243 + let vparam = 244 let vsmnth = 'Sep' elseif vmnth == 10 let vmdays = 31 - let vparam = 273 + let vparam = 274 let vsmnth = 'Oct' elseif vmnth == 11 let vmdays = 30 - let vparam = 304 + let vparam = 305 let vsmnth = 'Nov' elseif vmnth == 12 let vmdays = 31 - let vparam = 334 + let vparam = 335 let vsmnth = 'Dec' else echo 'Invalid Year or Month' return endif + if vyear % 400 == 0 + if vmnth == 2 + let vmdays = 29 + elseif vmnth >= 3 + let vparam = vparam + 1 + endif + elseif vyear % 100 == 0 + if vmnth == 2 + let vmdays = 28 + endif + elseif vyear % 4 == 0 + if vmnth == 2 + let vmdays = 29 + elseif vmnth >= 3 + let vparam = vparam + 1 + endif + endif " calc vnweek of the day if vnweek == -1 - let vnweek = ( vyear * 365 ) + vparam + 1 + let vnweek = ( vyear * 365 ) + vparam let vnweek = vnweek + ( vyear/4 ) - ( vyear/100 ) + ( vyear/400 ) - if vmnth < 3 && vyear % 4 == 0 + if vyear % 4 == 0 if vyear % 100 != 0 || vyear % 400 == 0 let vnweek = vnweek - 1 endif endif let vnweek = vnweek - 1 - endif - if vmnth == 2 - if vyear % 400 == 0 - let vmdays = 29 - elseif vyear % 100 == 0 - let vmdays = 28 - elseif vyear % 4 == 0 - let vmdays = 29 - endif endif " fix Gregorian @@ -643,8 +653,8 @@ let vnweek = vnweek - 1 elseif exists('g:calendar_weeknm') " if given g:calendar_weeknm, show week number(ref:ISO8601) - let viweek = (vparam + 1) / 7 - let vfweek = (vparam + 1) % 7 + let viweek = vparam / 7 + let vfweek = vparam % 7 if vnweek == 0 let vfweek = vfweek - 7 let viweek = viweek + 1 @@ -669,9 +679,6 @@ endif endif let vcolumn = vcolumn + 5 - if ((vyear % 4 == 0 && vmnth >= 3) || (vyear-1) % 4 == 0) - let viweek = viweek + 1 - endif endif "-------------------------------------------------------------- @@ -1215,6 +1222,8 @@ "*---------------------------------------------------------------- "***************************************************************** function! s:CalendarHelp() + echohl None + echo 'Calendar version ' . g:calendar_version echohl SpecialKey echo ' : goto prev month' echo ' : goto next month' From infocalculos at gmail.com Tue Apr 8 21:20:16 2008 From: infocalculos at gmail.com (Info Cálculos) Date: Tue, 08 Apr 2008 18:20:16 -0300 Subject: Realize cálculos trabalhistas e rescisões online Message-ID: An HTML attachment was scrubbed... URL: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080408/7d99a0e6/attachment.htm From jamessan at users.alioth.debian.org Tue Apr 8 21:22:27 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Tue, 08 Apr 2008 21:22:27 -0000 Subject: r1246 - /trunk/packages/vim-scripts/debian/patches/disabledby-calendar.dpatch Message-ID: Author: jamessan Date: Tue Apr 8 21:22:27 2008 New Revision: 1246 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1246 Log: Refresh disabledby-calendar.dpatch Modified: trunk/packages/vim-scripts/debian/patches/disabledby-calendar.dpatch Modified: trunk/packages/vim-scripts/debian/patches/disabledby-calendar.dpatch URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/patches/disabledby-calendar.dpatch?rev=1246&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/patches/disabledby-calendar.dpatch (original) +++ trunk/packages/vim-scripts/debian/patches/disabledby-calendar.dpatch Tue Apr 8 21:22:27 2008 @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad vim-scripts~/plugin/calendar.vim vim-scripts/plugin/calendar.vim ---- vim-scripts~/plugin/calendar.vim 2007-11-10 18:58:17.000000000 -0500 -+++ vim-scripts/plugin/calendar.vim 2007-11-13 01:05:20.000000000 -0500 +--- vim-scripts~/plugin/calendar.vim ++++ vim-scripts/plugin/calendar.vim @@ -301,6 +301,11 @@ " :echo calendar_version " GetLatestVimScripts: 52 1 :AutoInstall: calendar.vim @@ -17,6 +17,6 @@ +endif +let loaded_calendar = 1 + - let g:calendar_version = "1.6" + let g:calendar_version = "1.7" if &compatible finish From jamessan at users.alioth.debian.org Wed Apr 9 14:41:28 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Wed, 09 Apr 2008 14:41:28 -0000 Subject: r1247 - in /trunk/packages/vim-scripts/debian: changelog patches/00list patches/lbdbq-inputlist.dpatch Message-ID: Author: jamessan Date: Wed Apr 9 14:41:28 2008 New Revision: 1247 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1247 Log: Correct the use of inputlist() and its results so the user is able to press to cancel, as advertised. (Closes: #474599) Added: trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch (with props) Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/patches/00list Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1247&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Wed Apr 9 14:41:28 2008 @@ -2,15 +2,19 @@ * debian/control: - Update Standards-Version to 3.7.3.0 (no changes needed). - * patches/disabledby-xml.dpatch: - - Do not let loaded_xml_ftplugin since that will prevent the ftplugin from - being run in other buffers. Thanks to Marvin Renich for the patch fix. - (Closes: #465330) * Updated addons: - xmledit, surround, debPlugin, Markdown syntax, NERD Commenter, Enhanced Commentify, vcscommand, calendar. * New addons: - DetectIndent: Automatically detect indent settings. (Closes: #471890) + * Added patches: + - patches/disabledby-xml.dpatch: + + Do not let loaded_xml_ftplugin since that will prevent the ftplugin + from being run in other buffers. Thanks to Marvin Renich for the + patch. (Closes: #465330) + - patches/lbdbq-inputlist.dpatch: + + Correct the use of inputlist() and its results so the user is able to + press to cancel, as advertised. (Closes: #474599) -- James Vega Tue, 05 Feb 2008 17:06:54 -0500 Modified: trunk/packages/vim-scripts/debian/patches/00list URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/patches/00list?rev=1247&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/patches/00list (original) +++ trunk/packages/vim-scripts/debian/patches/00list Wed Apr 9 14:41:28 2008 @@ -14,3 +14,4 @@ usagestring-dtd2vim vimplate_debian-path detectindent_fix +lbdbq-inputlist Added: trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch?rev=1247&op=file ============================================================================== --- trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch (added) +++ trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch Wed Apr 9 14:41:28 2008 @@ -1,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## lbdbq-inputlist.dpatch by James Vega +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correct the use of inputlist's results so the user can press Enter to +## DP: cancel + + at DPATCH@ +Index: plugin/lbdbq.vim +=================================================================== +--- plugin/lbdbq.vim (revision 1237) ++++ plugin/lbdbq.vim (working copy) +@@ -47,14 +47,17 @@ + if empty(contacts) " no matching (long) contact found + return qstring + elseif len(contacts) > 1 " multiple matches: disambiguate +- echo "Choose a recipient for '" . qstring . "':" +- let choices = [] +- let counter = 0 ++ let choices = ["Choose a recipient for '" . qstring . "':"] ++ let counter = 1 + for contact in contacts + let choices += [ printf("%2d. %s <%s>", counter, contact[0], contact[1]) ] + let counter += 1 + endfor +- let contact = contacts[inputlist(choices)] ++ let result = inputlist(choices) ++ if result <= 0 || result > len(choices) ++ return a:qstring ++ endif ++ let contact = contacts[result-1] + else " len(contacts) == 1, i.e. one single match + let contact = contacts[0] + endif Propchange: trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch ------------------------------------------------------------------------------ svn:executable = * From jamessan at users.alioth.debian.org Wed Apr 9 14:49:05 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Wed, 09 Apr 2008 14:49:05 -0000 Subject: r1248 - /trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch Message-ID: Author: jamessan Date: Wed Apr 9 14:49:04 2008 New Revision: 1248 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1248 Log: Fix lbdbq-inputlist.dpatch so stupid dpatch knows how to apply it Modified: trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch Modified: trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch?rev=1248&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch (original) +++ trunk/packages/vim-scripts/debian/patches/lbdbq-inputlist.dpatch Wed Apr 9 14:49:04 2008 @@ -8,8 +8,8 @@ @DPATCH@ Index: plugin/lbdbq.vim =================================================================== ---- plugin/lbdbq.vim (revision 1237) -+++ plugin/lbdbq.vim (working copy) +--- a/plugin/lbdbq.vim (revision 1237) ++++ b/plugin/lbdbq.vim (working copy) @@ -47,14 +47,17 @@ if empty(contacts) " no matching (long) contact found return qstring From jamessan at debian.org Wed Apr 9 14:49:24 2008 From: jamessan at debian.org (James Vega) Date: Wed, 09 Apr 2008 10:49:24 -0400 Subject: Bug#474599: setting package to vim-scripts, tagging 474599 Message-ID: <1207752564-4164-bts-jamessan@debian.org> # Automatically generated email from bts, devscripts version 2.10.24 # # vim-scripts (7.1.7) UNRELEASED; urgency=low # # * Added patches: # - patches/disabledby-xml.dpatch: # + Do not let loaded_xml_ftplugin since that will prevent the ftplugin # from being run in other buffers. Thanks to Marvin Renich for the # patch. (Closes: #465330) # - patches/lbdbq-inputlist.dpatch: # + Correct the use of inputlist() and its results so the user is able to # press to cancel, as advertised. (Closes: #474599) # package vim-scripts tags 474599 + pending From owner at bugs.debian.org Wed Apr 9 14:51:03 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Wed, 09 Apr 2008 14:51:03 +0000 Subject: Processed: setting package to vim-scripts, tagging 474599 In-Reply-To: <1207752564-4164-bts-jamessan@debian.org> References: <1207752564-4164-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.24 > # > # vim-scripts (7.1.7) UNRELEASED; urgency=low > # > # * Added patches: > # - patches/disabledby-xml.dpatch: > # + Do not let loaded_xml_ftplugin since that will prevent the ftplugin > # from being run in other buffers. Thanks to Marvin Renich for the > # patch. (Closes: #465330) > # - patches/lbdbq-inputlist.dpatch: > # + Correct the use of inputlist() and its results so the user is able to > # press to cancel, as advertised. (Closes: #474599) > # > package vim-scripts Ignoring bugs not assigned to: vim-scripts > tags 474599 + pending Bug#474599: lbdbq: does not cancel a query There were no tags set. Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From jamessan at debian.org Wed Apr 9 15:53:35 2008 From: jamessan at debian.org (James Vega) Date: Wed, 09 Apr 2008 15:53:35 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-76-g8d68d09 Message-ID: The following commit has been merged in the debian branch: commit 8d68d09779c7a5d33dddda99e35c35aed5e17bc3 Author: James Vega Date: Tue Apr 8 07:39:54 2008 -0400 Use "setf" instead of "set ft" to set git filetype. Signed-off-by: James Vega diff --git a/debian/changelog b/debian/changelog index ae374d8..6748017 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ vim (1:7.1.291-2) UNRELEASED; urgency=low - Add Provides/Conflicts/Replaces for vim-{ruby,python,perl,tcl} in any variant that supports those language bindings since some packages want a vim that supports a certain language. + * runtime/filetype.vim: + - Use "setf" instead of "set ft" when setting the filetype to git so that + we don't override another filetype which may have been set during + filetype detection. -- James Vega Tue, 08 Apr 2008 05:03:25 -0400 -- Vim packaging From jamessan at debian.org Wed Apr 9 17:48:25 2008 From: jamessan at debian.org (James Vega) Date: Wed, 09 Apr 2008 17:48:25 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-77-ge29b808 Message-ID: The following commit has been merged in the debian branch: commit e29b8087e21f2ba25d434e978ea1dc1fed672e1e Author: James Vega Date: Wed Apr 9 13:47:57 2008 -0400 Only Build-Depend on libselinux1-dev for linux systems. Signed-off-by: James Vega diff --git a/debian/changelog b/debian/changelog index 6748017..69f9b89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ vim (1:7.1.291-2) UNRELEASED; urgency=low - Add Provides/Conflicts/Replaces for vim-{ruby,python,perl,tcl} in any variant that supports those language bindings since some packages want a vim that supports a certain language. + - Only Build-Depend on libselinux1-dev for linux systems. * runtime/filetype.vim: - Use "setf" instead of "set ft" when setting the filetype to git so that we don't override another filetype which may have been set during diff --git a/debian/control b/debian/control index ff96b46..cbb5090 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper, bzip2, libperl-dev, tcl-dev, libacl1-dev, libgpmg1-dev [!hurd-i386] | not+linux-gnu, python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev, lynx, libgnomeui-dev, lesstif2-dev, make (>= 3.80+3.81.b4), docbook-xml, - docbook-utils, libselinux1-dev, autoconf + docbook-utils, libselinux1-dev [!hurd-i386] | not+linux-gnu, autoconf Vcs-Git: git://git.debian.org/git/pkg-vim/vim.git Vcs-Browser: http://git.debian.org/?p=pkg-vim/vim.git Homepage: http://www.vim.org/ -- Vim packaging From kmccarty at debian.org Wed Apr 9 20:24:58 2008 From: kmccarty at debian.org (Kevin B. McCarty) Date: Wed, 09 Apr 2008 13:24:58 -0700 Subject: Bug#475266: vim: folding support for mbox format would be nice Message-ID: <47FD261A.2060507@debian.org> Package: vim Version: 1:7.1.291-1 Severity: wishlist Tags: patch Hi, I've been using vim to read debian-private archives on master. I like its syntax highlighting but have continually been annoyed that (a) I have to page-down through obvious spam, and (b) I have to view all of the headers to each mail message, most of which are completely uninteresting. I can't believe this doesn't exist already, but I can't find any plugin to implement folding for mbox format files. So I wrote one, see attached "fold-mail.vim". This folds mbox format files at two levels: 1) individual messages, and 2) the headers for each message. Author and subject of the message are displayed in the folding text at both levels. You may want to integrate into ftplugin/mail.vim. I wrote this as a quick hack in a couple hours, based only on ftplugin/debchangelog.vim and the online Vim documentation, so you may also want to do a sanity check on it first :-) best regards, -- Kevin B. McCarty WWW: http://www.starplot.org/ WWW: http://people.debian.org/~kmccarty/ GPG: public key ID 4F83C751 -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: fold-mail.vim Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/89ccda43/attachment.txt -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 252 bytes Desc: OpenPGP digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/89ccda43/attachment.pgp From kmccarty at debian.org Wed Apr 9 21:19:57 2008 From: kmccarty at debian.org (Kevin B. McCarty) Date: Wed, 09 Apr 2008 14:19:57 -0700 Subject: Bug#475300: vim: slight tweak to detection of "mail" format files Message-ID: <47FD32FD.7070202@debian.org> Package: vim Version: 1:7.1.291-1 Severity: minor Tags: patch Hi, I find that vim's detection of mbox (filetype "mail") files for syntax coloring, etc. doesn't work when they are generated by Mozilla Thunderbird, the reason being that in the From line preceding each message, Thunderbird apparently puts a "-" rather than an email address. Example header line in debian-private archive: From list at liszt.debian.org Tue Apr 01 09:36:16 2008 Example header line in my local mailbox generated by Icedove: From - Wed Jan 02 08:44:14 2008 The attached, very minor patch to /usr/share/vim/vim71/scripts.vim allows vim to also realize that Thunderbird's idiosyncratic headers signal a file in mbox format. Side note: This is not included in the patch, but also maybe "=~" on the line changed by the diff should be changed to "=~#" since to the best of my knowledge, the "From" is case-sensitive. best regards, -- Kevin B. McCarty WWW: http://www.starplot.org/ WWW: http://people.debian.org/~kmccarty/ GPG: public key ID 4F83C751 -------------- next part -------------- A non-text attachment was scrubbed... Name: scripts.vim.diff Type: text/x-patch Size: 372 bytes Desc: not available Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/31e3bd30/attachment-0001.bin -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 252 bytes Desc: OpenPGP digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/31e3bd30/attachment-0001.pgp From kmccarty at debian.org Wed Apr 9 23:10:42 2008 From: kmccarty at debian.org (Kevin B. McCarty) Date: Wed, 09 Apr 2008 16:10:42 -0700 Subject: Bug#475266: bug-fixed version of fold-mail.vim In-Reply-To: References: <47FD261A.2060507@debian.org> Message-ID: <47FD4CF2.9000705@debian.org> Slightly bugfixed version of fold-mail.vim attached, use this one as a starting point rather than the original. This one doesn't try to do folding if the mbox file doesn't start with a "From" header. Also it deals correctly with blank header fields that have no space immediately after the header name (like "Subject:" rather than "Subject: ") and accounts for line numbers in Vim starting at 1 (not 0). In case a license statement is necessary: I hereby release the attached file fold-mail.vim to the public domain. best regards, -- Kevin B. McCarty WWW: http://www.starplot.org/ WWW: http://people.debian.org/~kmccarty/ GPG: public key ID 4F83C751 -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: fold-mail.vim Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/04d1ccd6/attachment.txt -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 252 bytes Desc: OpenPGP digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/04d1ccd6/attachment.pgp From kmccarty at debian.org Wed Apr 9 23:41:45 2008 From: kmccarty at debian.org (Kevin B. McCarty) Date: Wed, 09 Apr 2008 16:41:45 -0700 Subject: Bug#475266: third iteration In-Reply-To: References: <47FD4CF2.9000705@debian.org> Message-ID: <47FD5439.4070908@debian.org> Third iteration of mbox folding: take into account that header field names (Subject, From) are case-insensitive, and allow tab(s) as well as space(s) to follow them. Sorry for all the noise, this should be the final version. best regards, -- Kevin B. McCarty WWW: http://www.starplot.org/ WWW: http://people.debian.org/~kmccarty/ GPG: public key ID 4F83C751 -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: fold-mail.vim Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/fb626e8f/attachment.txt -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 252 bytes Desc: OpenPGP digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080409/fb626e8f/attachment.pgp From biebl at debian.org Fri Apr 11 18:05:24 2008 From: biebl at debian.org (Michael Biebl) Date: Fri, 11 Apr 2008 20:05:24 +0200 Subject: Bug#475568: /usr/share/vim/vim71/syntax/messages.vim: Please add support for RFC 3339 high precision timestamps Message-ID: <20080411180524.26732.79363.reportbug@pluto.milchstrasse.xx> Package: vim-runtime Version: 1:7.1.291-1 Severity: wishlist File: /usr/share/vim/vim71/syntax/messages.vim Hi, as rsyslog by default enables high precision timestamps [1], it would be nice if the vim syntax file(s) would also support this timestamp format. See also http://www.ietf.org/rfc/rfc3339.txt A typical log entry with the new timestamp looks like this: 2008-04-06T02:18:36+02:00 pluto kernel: [ 1.614742] serial ... Cheers, Michael [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475553 -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (500, 'unstable'), (300, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.24.4 Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash vim-runtime depends on no packages. Versions of packages vim-runtime recommends: ii vim 1:7.1.291-1 Vi IMproved - enhanced vi editor ii vim-gnome [vim] 1:7.1.291-1 Vi IMproved - enhanced vi editor - -- no debconf information From biebl at debian.org Sat Apr 12 00:12:32 2008 From: biebl at debian.org (Michael Biebl) Date: Sat, 12 Apr 2008 02:12:32 +0200 Subject: Bug#475568: Acknowledgement (/usr/share/vim/vim71/syntax/messages.vim: Please add support for RFC 3339 high precision timestamps) In-Reply-To: References: <20080411180524.26732.79363.reportbug@pluto.milchstrasse.xx> Message-ID: <47FFFE70.9060308@debian.org> Here is a better example, which actually uses sub-second precision time stamps: 2008-04-11T18:22:58.358767+02:00 pluto smartd[2487]: Device: /dev/sda... Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 252 bytes Desc: OpenPGP digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080412/56de4bfc/attachment.pgp From owner at bugs.debian.org Sat Apr 12 01:27:10 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 12 Apr 2008 01:27:10 +0000 Subject: Processed: reassign 475266 to vim-runtime, retitle 475266 to [vim-runtime] Add folding of mbox files ... In-Reply-To: <1207963423-1720-bts-jamessan@debian.org> References: <1207963423-1720-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > reassign 475266 vim-runtime Bug#475266: vim: folding support for mbox format would be nice Bug reassigned from package `vim' to `vim-runtime'. > retitle 475266 [vim-runtime] Add folding of mbox files Bug#475266: vim: folding support for mbox format would be nice Changed Bug title to `[vim-runtime] Add folding of mbox files' from `vim: folding support for mbox format would be nice'. > user vim at packages.debian.org Setting user to vim at packages.debian.org (was jamessan at debian.org). > usertags 475266 vim-runtime Bug#475266: [vim-runtime] Add folding of mbox files There were no usertags set. Usertags are now: vim-runtime. > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From owner at bugs.debian.org Sat Apr 12 01:27:11 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 12 Apr 2008 01:27:11 +0000 Subject: Processed: retitle 475568 to [vim-runtime] Recognize RFC 3339 high-precision timestamps ..., usertagging 475568 In-Reply-To: <1207963563-3242-bts-jamessan@debian.org> References: <1207963563-3242-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > retitle 475568 [vim-runtime] Recognize RFC 3339 high-precision timestamps Bug#475568: /usr/share/vim/vim71/syntax/messages.vim: Please add support for RFC 3339 high precision timestamps Changed Bug title to `[vim-runtime] Recognize RFC 3339 high-precision timestamps' from `/usr/share/vim/vim71/syntax/messages.vim: Please add support for RFC 3339 high precision timestamps'. > user vim at packages.debian.org Setting user to vim at packages.debian.org (was jamessan at debian.org). > usertags 475568 vim-runtime Bug#475568: [vim-runtime] Recognize RFC 3339 high-precision timestamps There were no usertags set. Usertags are now: vim-runtime. > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From owner at bugs.debian.org Sat Apr 12 01:27:08 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 12 Apr 2008 01:27:08 +0000 Subject: Processed: reassign 475300 to vim-runtime ..., user vim@packages.debian.org, usertagging 475300 In-Reply-To: <1207963360-2599-bts-jamessan@debian.org> References: <1207963360-2599-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > reassign 475300 vim-runtime Bug#475300: vim: slight tweak to detection of "mail" format files Bug reassigned from package `vim' to `vim-runtime'. > retitle 475300 [vim-runtime] Recognize Mozilla-generated mbox files Bug#475300: vim: slight tweak to detection of "mail" format files Changed Bug title to `[vim-runtime] Recognize Mozilla-generated mbox files' from `vim: slight tweak to detection of "mail" format files'. > user vim at packages.debian.org Setting user to vim at packages.debian.org (was jamessan at debian.org). > usertags 475300 vim-runtime Bug#475300: [vim-runtime] Recognize Mozilla-generated mbox files There were no usertags set. Usertags are now: vim-runtime. > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From fred.julian at gmail.com Sun Apr 13 09:59:48 2008 From: fred.julian at gmail.com (=?UTF-8?Q?Fr=C3=A9d=C3=A9ric?= Julian) Date: Sun, 13 Apr 2008 11:59:48 +0200 Subject: Bug#475835: vim: no longer clipboard ("+ or "*) interaction with KDE Message-ID: <20080413095948.20441.44685.reportbug@mypc> Package: vim Version: 1:7.1-266+1 Severity: normal Hi everbody, Recently, on a "testing" system with KDE 3.5.9, I can't use the "+ register to communicate with my clipboard. I also try the "* register but it just doesn't want to work. I'm almost sure that this fonctionnality works 1 or 2 month ago. -- System Information: Debian Release: lenny/sid APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages vim depends on: ii libacl1 2.2.45-1 Access control list shared library ii libc6 2.7-10 GNU C Library: Shared libraries ii libgpmg1 1.20.3~pre3-3 General Purpose Mouse - shared lib ii libncurses5 5.6+20080308-1 Shared libraries for terminal hand ii vim-common 1:7.1-266+1 Vi IMproved - Common files ii vim-runtime 1:7.1-266+1 Vi IMproved - Runtime files vim recommends no packages. -- no debconf information From jamessan at debian.org Mon Apr 14 15:57:46 2008 From: jamessan at debian.org (James Vega) Date: Mon, 14 Apr 2008 15:57:46 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-78-ge324435 Message-ID: The following commit has been merged in the debian branch: commit e324435d3d73434f026821aaa1faf5112daf6b19 Author: James Vega Date: Mon Apr 14 11:45:36 2008 -0400 Cleanup Conflicts/Provides/Replaces related to transition packages. - Transition packages (vim-$language, vim-full) no longer have Provides. - The packages which are Depended on by transition packages no longer Conflict/Replace the transition package. - Clarify the wording of the changelog entry for the new Provides. Signed-off-by: James Vega diff --git a/debian/changelog b/debian/changelog index 69f9b89..682a8b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ vim (1:7.1.291-2) UNRELEASED; urgency=low * debian/control: - - Add Provides/Conflicts/Replaces for vim-{ruby,python,perl,tcl} in any - variant that supports those language bindings since some packages want a - vim that supports a certain language. + - Add Provides for vim-{ruby,python,perl,tcl} to any variant that supports + those language bindings since some packages benefit from being able to + specify a Depends on a vim package with support for a specific language. - Only Build-Depend on libselinux1-dev for linux systems. + - Remove Provides from the transition packages. * runtime/filetype.vim: - Use "setf" instead of "set ft" when setting the filetype to git so that we don't override another filetype which may have been set during diff --git a/debian/control b/debian/control index cbb5090..2b7c45e 100644 --- a/debian/control +++ b/debian/control @@ -137,7 +137,6 @@ Package: vim-perl Priority: extra Architecture: all Depends: vim-gtk (>= 1:7.1-135+1) -Provides: gvim, editor Description: Vi IMproved - enhanced vi editor (transitional package) This package is simply a transitional package from individual vim-$language packages to vim-gtk. @@ -146,7 +145,6 @@ Package: vim-python Priority: extra Architecture: all Depends: vim-gtk (>= 1:7.1-135+1) -Provides: gvim, editor Description: Vi IMproved - enhanced vi editor (transitional package) This package is simply a transitional package from individual vim-$language packages to vim-gtk. @@ -155,7 +153,6 @@ Package: vim-ruby Priority: extra Architecture: all Depends: vim-gtk (>= 1:7.1-135+1) -Provides: gvim, editor Description: Vi IMproved - enhanced vi editor (transitional package) This package is simply a transitional package from individual vim-$language packages to vim-gtk. @@ -164,7 +161,6 @@ Package: vim-tcl Priority: extra Architecture: all Depends: vim-gtk (>= 1:7.1-135+1) -Provides: gvim, editor Description: Vi IMproved - enhanced vi editor (transitional package) This package is simply a transitional package from individual vim-$language packages to vim-gtk. @@ -173,8 +169,6 @@ Package: vim-gtk Priority: extra Architecture: any Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends} -Conflicts: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) -Replaces: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) Suggests: cscope, vim-doc, ttf-dejavu, gnome-icon-theme Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl Description: Vi IMproved - enhanced vi editor - with GTK2 GUI @@ -191,8 +185,6 @@ Package: vim-nox Priority: extra Architecture: any Depends: vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends} -Conflicts: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) -Replaces: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) Suggests: cscope, vim-doc Provides: vim, editor, vim-perl, vim-python, vim-ruby, vim-tcl Description: Vi IMproved - enhanced vi editor @@ -209,8 +201,6 @@ Package: vim-lesstif Priority: extra Architecture: any Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends} -Conflicts: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) -Replaces: vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) Suggests: cscope, vim-doc, ttf-dejavu Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl Description: Vi IMproved - enhanced vi editor - with LessTif GUI @@ -227,8 +217,6 @@ Package: vim-gnome Priority: extra Architecture: any Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends} -Conflicts: vim-full (<< 1:7.1-135+1), vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) -Replaces: vim-full (<< 1:7.1-135+1), vim-python (<< 1:7.1-135+1), vim-perl (<< 1:7.1-135+1), vim-ruby (<< 1:7.1-135+1), vim-tcl (<< 1:7.1-135+1) Suggests: cscope, vim-doc, ttf-dejavu, gnome-icon-theme Provides: vim, gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl Description: Vi IMproved - enhanced vi editor - with GNOME2 GUI @@ -245,6 +233,5 @@ Package: vim-full Priority: extra Architecture: all Depends: vim-gnome (>= 1:7.1-135+1) -Provides: gvim, editor, vim-perl, vim-python, vim-ruby, vim-tcl Description: Vi IMproved - enhanced vi editor (transitional package) This package is simply a transitional package from vim-full to vim-gnome. -- Vim packaging From jamessan at debian.org Tue Apr 15 14:18:36 2008 From: jamessan at debian.org (James Vega) Date: Tue, 15 Apr 2008 14:18:36 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-79-g21163b7 Message-ID: The following commit has been merged in the debian branch: commit 21163b775f27cfcb53982c4f5714ea5afbded057 Author: James Vega Date: Tue Apr 15 10:15:29 2008 -0400 Add oldstable-p-u/p-u to list of recognized releases. Signed-off-by: James Vega diff --git a/debian/changelog b/debian/changelog index 682a8b7..69ae9fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ vim (1:7.1.291-2) UNRELEASED; urgency=low - Use "setf" instead of "set ft" when setting the filetype to git so that we don't override another filetype which may have been set during filetype detection. + * runtime/syntax/debchangelog.vim: + - Cleanup the list of recognized releases and add + oldstable-proposed-updates/proposed-updates. -- James Vega Tue, 08 Apr 2008 05:03:25 -0400 diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim index 28fe854..f2b8a8e 100644 --- a/runtime/syntax/debchangelog.vim +++ b/runtime/syntax/debchangelog.vim @@ -19,7 +19,7 @@ syn case ignore " Define some common expressions we can use later on syn match debchangelogName contained "^[[:alpha:]][[:alnum:].+-]\+ " syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\=" -syn match debchangelogTarget contained "\( \(old\)\=stable\| frozen\| unstable\| testing-proposed-updates\| experimental\| \%(sarge\|etch\|lenny\)-\%(backports\|-volatile\)\| \(old\)\=stable-security\| testing-security\| \(dapper\|edgy\|feisty\|gutsy\|hardy\)\(-\(security\|proposed\|updates\|backports\|commercial\|partner\)\)\?\)\+" +syn match debchangelogTarget contained "\v %(%(old)=stable|frozen|unstable|%(testing-|%(old)=stable-)=proposed-updates|experimental|%(sarge|etch|lenny)-%(backports|volatile)|%(testing|%(old)=stable)-security|%(dapper|edgy|feisty|gutsy|hardy)%(-%(security|proposed|updates|backports|commercial|partner))=)+" syn match debchangelogVersion contained "(.\{-})" syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*" syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*" -- Vim packaging From mralfredquinton at web2mail.com Tue Apr 15 15:39:37 2008 From: mralfredquinton at web2mail.com (Mr.Alfred S. Quinton.) Date: Tue, 15 Apr 2008 17:39:37 +0200 (CEST) Subject: MODEL SHOOT Message-ID: <20080415153941.AD13E40138@usersmtp.funpicsmtp.de> Tower 42, Level 30 25 Old Broad Street London. EC2N 1HQ United Kingdom PH +44(0)7045767642 PH +44(0)7024032039 Fax: +448715031317 Hello Friend, I am Mr.Alfred S. Quinton Of Brave Network Fashion Company.Currently based in the United Kingdom. I browse your E-mail address on the internet,If you would welcome a Model shoot Job here in the United Kingdom. The information of the job will be send to you. Also,you are to note that it do not matter if you are already attached to any agency. Regards, Mr.Alfred S. Quinton. -- Powered by http://www.ohost.de Kostenloser Webspace mit PHP und MySQL Support! 8x MySQL 8x FTP Traffic inklusive! Diese Email wurde vom Nutzer dwnfgtr versendet. SPAM an abuse at ohost.de melden! From jamessan at users.alioth.debian.org Wed Apr 16 01:57:05 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Wed, 16 Apr 2008 01:57:05 -0000 Subject: r1249 - in /trunk/packages/vim-latexsuite/debian: rules vim-registry/vim-latexsuite.yaml Message-ID: Author: jamessan Date: Wed Apr 16 01:57:05 2008 New Revision: 1249 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1249 Log: Remove BORKENFILES from the package instead of the source and remove their entries from the yaml file. Modified: trunk/packages/vim-latexsuite/debian/rules trunk/packages/vim-latexsuite/debian/vim-registry/vim-latexsuite.yaml Modified: trunk/packages/vim-latexsuite/debian/rules URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/rules?rev=1249&op=diff ============================================================================== --- trunk/packages/vim-latexsuite/debian/rules (original) +++ trunk/packages/vim-latexsuite/debian/rules Wed Apr 16 01:57:05 2008 @@ -88,7 +88,9 @@ install-script: cp -R $(DIRS) $(INSTALLDIR) - rm -f $(BORKENFILES) + for i in $(BORKENFILES); do \ + rm -f $(INSTALLDIR)/$$i; \ + done gzip-doc: $(DOCFILES) Modified: trunk/packages/vim-latexsuite/debian/vim-registry/vim-latexsuite.yaml URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/vim-registry/vim-latexsuite.yaml?rev=1249&op=diff ============================================================================== --- trunk/packages/vim-latexsuite/debian/vim-registry/vim-latexsuite.yaml (original) +++ trunk/packages/vim-latexsuite/debian/vim-registry/vim-latexsuite.yaml Wed Apr 16 01:57:05 2008 @@ -113,9 +113,7 @@ - ftplugin/latex-suite/texviewer.vim - ftplugin/latex-suite/version.vim - ftplugin/latex-suite/wizardfuncs.vim - - ftplugin/tex/brackets.vim - ftplugin/tex_latexSuite.vim - - ftplugin/tex/texviewer.vim - indent/tex.vim - plugin/filebrowser.vim - plugin/imaps.vim From jamessan at debian.org Wed Apr 16 02:02:59 2008 From: jamessan at debian.org (James Vega) Date: Wed, 16 Apr 2008 02:02:59 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-80-gba6d9f9 Message-ID: The following commit has been merged in the debian branch: commit ba6d9f93a2b99a557e2760d62dbaaddcac65032e Author: James Vega Date: Tue Apr 15 22:01:48 2008 -0400 Clarify some wording in README.git. Signed-off-by: James Vega diff --git a/debian/README.git b/debian/README.git index 7909ce5..19d4083 100644 --- a/debian/README.git +++ b/debian/README.git @@ -10,7 +10,6 @@ should be built. This can be done by running "git archive --format=tar ../vim_7.1.$newest_patch_number.orig.tar.gz". This should probably be handled by debian/update-patches. -Before building a new package, master:runtime/doc/tags should be rebuilt -since we usually have newer runtime files than the base upstream release. -This is simply done by running "vim -c 'helptags ++t runtime/doc' -c 'q'" and -then checking the file in. +Before building a new package which changes runtime/doc, +master:runtime/doc/tags should be rebuilt. This is simply done by running +"vim -c 'helptags ++t runtime/doc' -c 'q'" and then checking the file in. -- Vim packaging From jamessan at debian.org Wed Apr 16 03:34:11 2008 From: jamessan at debian.org (James Vega) Date: Wed, 16 Apr 2008 03:34:11 +0000 Subject: [SCM] Vim packaging branch, pristine-tar, updated. 1e012a526fc7b4e3f092469b8117605a59270a15 Message-ID: The following commit has been merged in the pristine-tar branch: commit 1e012a526fc7b4e3f092469b8117605a59270a15 Author: James Vega Date: Tue Apr 15 22:21:39 2008 -0400 pristine-tar data for vim_7.1.293.orig.tar.gz diff --git a/vim_7.1.293.orig.tar.gz.delta b/vim_7.1.293.orig.tar.gz.delta new file mode 100644 index 0000000..b9a173a Binary files /dev/null and b/vim_7.1.293.orig.tar.gz.delta differ diff --git a/vim_7.1.293.orig.tar.gz.id b/vim_7.1.293.orig.tar.gz.id new file mode 100644 index 0000000..3b074e4 --- /dev/null +++ b/vim_7.1.293.orig.tar.gz.id @@ -0,0 +1 @@ +74cdbf81a765a406c692033dede7bbf6b7aa743f -- Vim packaging From jamessan at debian.org Wed Apr 16 03:34:20 2008 From: jamessan at debian.org (James Vega) Date: Wed, 16 Apr 2008 03:34:20 +0000 Subject: [SCM] Vim packaging annotated tag, debian/7.1.293-1, created. debian/7.1.293-1 Message-ID: The annotated tag, debian/7.1.293-1 has been created at e6448e89772f814b6a489a384b5d5ed87c11e8e3 (tag) tagging 08a0765143b4eadfe9e615c537b4d1eafa49d22d (commit) replaces debian/7.1.291-1 tagged by James Vega on Tue Apr 15 23:19:49 2008 -0400 - Shortlog ------------------------------------------------------------ Debian release 1:7.1.293-1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iEYEABECAAYFAkgFcFkACgkQDb3UpmEybUBacQCghFe0eKOLlo/Ru/iSQONaxcxN K9AAmgIDMhiZgNX/1efCLEyNCuIy452T =zM0S -----END PGP SIGNATURE----- Bram Moolenaar (2): when using a pattern with "\@<=" the submatches can be wrong spell checking considers super/subscript chars as word chars James Vega (12): Merge branch 'upstream' into upstream-runtime Add Provides: vim-$language to the relevant variants. Use "setf" instead of "set ft" to set git filetype. Use "setf" instead of "set ft" to set git filetype. Only Build-Depend on libselinux1-dev for linux systems. Cleanup Conflicts/Provides/Replaces related to transition packages. Add oldstable-p-u/p-u to list of recognized releases. Clarify some wording in README.git. Merge branch 'upstream' into upstream-runtime Merge branch 'upstream' into debian Upstream patches 292 & 293 Merge branches 'debian' and 'upstream-runtime' ----------------------------------------------------------------------- -- Vim packaging From jamessan at debian.org Wed Apr 16 03:34:20 2008 From: jamessan at debian.org (James Vega) Date: Wed, 16 Apr 2008 03:34:20 +0000 Subject: [SCM] Vim packaging tag, upstream/7.1.293, created. upstream/7.1.285-8-g74cdbf8 Message-ID: The tag, upstream/7.1.293 has been created at 74cdbf81a765a406c692033dede7bbf6b7aa743f (commit) - Shortlog ------------------------------------------------------------ commit 74cdbf81a765a406c692033dede7bbf6b7aa743f Author: Bram Moolenaar Date: Tue Apr 15 22:03:21 2008 -0400 spell checking considers super/subscript chars as word chars Patch 7.1.293 Problem: Spell checking considers super- and subscript characters as word characters. Solution: Recognize the Unicode super and subscript characters. ----------------------------------------------------------------------- -- Vim packaging From bigon-guest at users.alioth.debian.org Thu Apr 17 14:56:56 2008 From: bigon-guest at users.alioth.debian.org (bigon-guest at users.alioth.debian.org) Date: Thu, 17 Apr 2008 14:56:56 -0000 Subject: r1250 - in /trunk/packages/vim-syntax-gtk/debian: changelog control Message-ID: Author: bigon-guest Date: Thu Apr 17 14:56:55 2008 New Revision: 1250 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1250 Log: * debian/control: - Use new Homepage field instead of old pseudo-field - Bump Standards-Version to 3.7.3 (no further changes) - Correct the capitalization of some terms Modified: trunk/packages/vim-syntax-gtk/debian/changelog trunk/packages/vim-syntax-gtk/debian/control Modified: trunk/packages/vim-syntax-gtk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-syntax-gtk/debian/changelog?rev=1250&op=diff ============================================================================== --- trunk/packages/vim-syntax-gtk/debian/changelog (original) +++ trunk/packages/vim-syntax-gtk/debian/changelog Thu Apr 17 14:56:55 2008 @@ -1,7 +1,10 @@ vim-syntax-gtk (20070925-2) UNRELEASED; urgency=low * NOT RELEASED YET - * Use new Homepage field instead of old pseudo-field + * debian/control: + - Use new Homepage field instead of old pseudo-field + - Bump Standards-Version to 3.7.3 (no further changes) + - Correct the capitalization of some terms -- Laurent Bigonville Thu, 08 Nov 2007 05:14:10 +0100 Modified: trunk/packages/vim-syntax-gtk/debian/control URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-syntax-gtk/debian/control?rev=1250&op=diff ============================================================================== --- trunk/packages/vim-syntax-gtk/debian/control (original) +++ trunk/packages/vim-syntax-gtk/debian/control Thu Apr 17 14:56:55 2008 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Laurent Bigonville Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim-syntax-gtk Vcs-Browser: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-syntax-gtk/ Homepage: http://www.vim.org/scripts/script.php?script_id=1000 @@ -11,7 +11,7 @@ Package: vim-syntax-gtk Architecture: all Recommends: vim-addon-manager -Description: Syntax files to highlight gtk+ keywords in vim - A collection of C extension syntax files for xlib, glib, gobject, gdk, - gdk-pixbuf, gtk+, atk, pango, cairo, gimp, libgnome, libgnomecanvas, - libgnomeui, libglade, gtkglext, vte, linc, gconf, and ORBit. +Description: Syntax files to highlight GTK+ keywords in vim + A collection of C extension syntax files for Xlib, Glib, GObject, GDK, + GdkPixBuf, GTK+, ATK, Pango, Cairo, libgimp, libgnome, libgnomecanvas, + libgnomeui, libglade, gtkglext, VTE, linc, GConf, and ORBit. From owner at bugs.debian.org Thu Apr 17 22:45:04 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Thu, 17 Apr 2008 22:45:04 +0000 Subject: Bug#475835: marked as done (vim: no longer clipboard ("+ or "*) interaction with KDE) References: <20080417224248.GC26912@jamessan.com> <20080413095948.20441.44685.reportbug@mypc> Message-ID: Your message dated Thu, 17 Apr 2008 18:42:48 -0400 with message-id <20080417224248.GC26912 at jamessan.com> and subject line Re: Bug#475835: vim: no longer clipboard ("+ or "*) interaction with KDE has caused the Debian Bug report #475835, regarding vim: no longer clipboard ("+ or "*) interaction with KDE to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 475835: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475835 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: =?utf-8?b?RnLDqWTDqXJpYyBKdWxpYW4=?= Subject: vim: no longer clipboard ("+ or "*) interaction with KDE Date: Sun, 13 Apr 2008 11:59:48 +0200 Size: 2807 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080417/6cad3b67/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Re: Bug#475835: vim: no longer clipboard ("+ or "*) interaction with KDE Date: Thu, 17 Apr 2008 18:42:48 -0400 Size: 3146 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080417/6cad3b67/attachment-0001.eml From jamessan at debian.org Fri Apr 18 00:21:12 2008 From: jamessan at debian.org (James Vega) Date: Fri, 18 Apr 2008 00:21:12 +0000 Subject: [SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-50-gfba32b1 Message-ID: The following commit has been merged in the deb/runtime branch: commit fba32b1d789255cc18b4ca1f649666cb0d4c0fd4 Author: James Vega Date: Thu Apr 17 20:16:44 2008 -0400 Fix a missing comma in the cron filetype detection. Signed-off-by: James Vega diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 3e61508..46ee590 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2182,7 +2182,7 @@ au BufNewFile,BufRead [cC]hange[lL]og* \|endif " Crontab -au BufNewFile,BufRead crontab,crontab.*/etc/cron.d/* call s:StarSetf('crontab') +au BufNewFile,BufRead crontab,crontab.*,/etc/cron.d/* call s:StarSetf('crontab') " Debian Sources.list au BufNewFile,BufRead /etc/apt/sources.list.d/* call s:StarSetf('debsources') -- Vim packaging From jamessan at debian.org Fri Apr 18 02:05:55 2008 From: jamessan at debian.org (James Vega) Date: Fri, 18 Apr 2008 02:05:55 +0000 Subject: [SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-51-g05d4446 Message-ID: The following commit has been merged in the deb/runtime branch: commit 05d444676148a39a1d5c003b750a8bd7b66bcc34 Author: James Vega Date: Thu Apr 17 21:56:08 2008 -0400 Add filetype detection of more Apache config files. Closes #421312 Signed-off-by: James Vega diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 46ee590..a61acb3 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -108,7 +108,7 @@ au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle') " Apache config file au BufNewFile,BufRead .htaccess setf apache -au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache') +au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,/etc/apache2/conf.*/*,/etc/apache2/sites-*/*,/etc/apache2/mods-*/* call s:StarSetf('apache') " XA65 MOS6510 cross assembler au BufNewFile,BufRead *.a65 setf a65 -- Vim packaging From owner at bugs.debian.org Fri Apr 18 02:09:02 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 18 Apr 2008 02:09:02 +0000 Subject: Processed: tagging 421312 In-Reply-To: <1208484389-1796-bts-jamessan@debian.org> References: <1208484389-1796-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > tags 421312 pending Bug#421312: [vim-runtime] Detect more apache config files Tags were: patch Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From jamessan at debian.org Fri Apr 18 02:13:10 2008 From: jamessan at debian.org (James Vega) Date: Fri, 18 Apr 2008 02:13:10 +0000 Subject: [SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-52-gbcef103 Message-ID: The following commit has been merged in the deb/runtime branch: commit bcef103a36622bf584b69ecc94e3803fa63bded2 Author: James Vega Date: Thu Apr 17 22:09:44 2008 -0400 Improve filetype detection of strace logs. Match strace logs when strace was configured to follow forks. This causes the processes' pids to be displayed at the start of the line which prevented the old filetype detection from matching. Closes #473967 Signed-off-by: James Vega diff --git a/runtime/scripts.vim b/runtime/scripts.vim index ad4278c..e2b4b3d 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -271,7 +271,7 @@ else set ft=virata " Strace - elseif s:line1 =~ '^[0-9]* *execve(' || s:line1 =~ '^__libc_start_main' + elseif s:line1 =~ '^\(\[pid \d\+\] \)\=[0-9:.]* *execve(' || s:line1 =~ '^__libc_start_main' set ft=strace " VSE JCL -- Vim packaging From owner at bugs.debian.org Fri Apr 18 02:15:03 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 18 Apr 2008 02:15:03 +0000 Subject: Processed: tagging 473967 In-Reply-To: <1208484803-3092-bts-jamessan@debian.org> References: <1208484803-3092-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > tags 473967 pending Bug#473967: [vim-runtime] Improve strace filetype detection Tags were: patch Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From jamessan at debian.org Fri Apr 18 03:10:36 2008 From: jamessan at debian.org (James Vega) Date: Fri, 18 Apr 2008 03:10:36 +0000 Subject: [SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-53-g1a3e354 Message-ID: The following commit has been merged in the deb/runtime branch: commit 1a3e35497d48c8eb73ce3711ebb6469bf8072f9a Author: James Vega Date: Thu Apr 17 23:07:15 2008 -0400 Add detection of more passwd/shadow related files. Include {passwd,shadow,group,gshadow}.edit (filename used by vipw/vigr) Include the .bak files under /var/backups Add the - suffix for all the related files under /etc. Closes #420304 Signed-off-by: James Vega diff --git a/runtime/filetype.vim b/runtime/filetype.vim index a61acb3..e703f92 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -699,7 +699,7 @@ au BufNewFile,BufRead *.groovy setf groovy au BufNewFile,BufRead *.gsp setf gsp " Group file -au BufNewFile,BufRead /etc/group setf group +au BufNewFile,BufRead /etc/group{-,.edit,},/etc/gshadow{-,.edit,},/var/backups/{group,gshadow}.bak setf group " GTK RC au BufNewFile,BufRead .gtkrc,gtkrc setf gtkrc @@ -1175,7 +1175,7 @@ au BufNewFile,BufRead /etc/pam.conf setf pamconf au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp " Password file -au BufNewFile,BufRead /etc/passwd,/etc/shadow,/etc/shadow- setf passwd +au BufNewFile,BufRead /etc/passwd{-,.edit,},/etc/shadow{-,.edit,},/var/backups/{passwd,shadow}.bak setf passwd " Pascal (also *.p) au BufNewFile,BufRead *.pas setf pascal -- Vim packaging From owner at bugs.debian.org Fri Apr 18 03:12:04 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 18 Apr 2008 03:12:04 +0000 Subject: Processed: tagging 420304 In-Reply-To: <1208488278-3739-bts-jamessan@debian.org> References: <1208488278-3739-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > tags 420304 pending Bug#420304: [vim-runtime] Detect more passwd/group files Tags were: patch Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From jamessan at debian.org Fri Apr 18 03:19:20 2008 From: jamessan at debian.org (James Vega) Date: Fri, 18 Apr 2008 03:19:20 +0000 Subject: [SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-54-g9027d5a Message-ID: The following commit has been merged in the deb/runtime branch: commit 9027d5a6c8be743413a3527f3d31c7b919e4b9e8 Author: James Vega Date: Thu Apr 17 23:16:43 2008 -0400 Detect Mozilla Thunderbird's mbox file as mail filetype. Thunderbird doesn't include the email address on the From line, instead using a single '-' character. Change the regex to allow either an email address or the '-'. Closes #475300. Thanks to Kevin B. McCarty Signed-off-by: James Vega diff --git a/runtime/scripts.vim b/runtime/scripts.vim index e2b4b3d..49f1bcc 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -168,7 +168,7 @@ else set ft=zsh " ELM Mail files - elseif s:line1 =~ '^From [a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\= .*[12][09]\d\d$' + elseif s:line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .*[12][09]\d\d$' set ft=mail " Mason -- Vim packaging From owner at bugs.debian.org Fri Apr 18 03:21:03 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 18 Apr 2008 03:21:03 +0000 Subject: Processed: tagging 475300 In-Reply-To: <1208488776-2489-bts-jamessan@debian.org> References: <1208488776-2489-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > tags 475300 pending Bug#475300: [vim-runtime] Recognize Mozilla-generated mbox files Tags were: patch Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From jamessan at debian.org Fri Apr 18 03:27:59 2008 From: jamessan at debian.org (James Vega) Date: Thu, 17 Apr 2008 23:27:59 -0400 Subject: Bug#374835: please add Ragel vim syntax file In-Reply-To: <20060621142717.9194.98662.reportbug@klecker> References: <20060621142717.9194.98662.reportbug@klecker> Message-ID: <20080418032759.GD26912@jamessan.com> On Wed, Jun 21, 2006 at 04:27:17PM +0200, Francesco Paolo Lovergine wrote: > http://www.cs.queensu.ca/home/thurston/ragel/ragel.vim > > Ragel is already a packaged program for FSMs If you're in touch with Ragel's upstream, it'd be better to have them push the file to Bram for inclusion in Vim. Especially since they'll be aware of when any changes are made and can then ask Bram to include a newer version of the syntax file. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: Digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080417/5e64331b/attachment.pgp From owner at bugs.debian.org Fri Apr 18 03:36:02 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 18 Apr 2008 03:36:02 +0000 Subject: Bug#392186: marked as done ([vim] Find and highlight possible typos in your code in quickfix mode) References: <20080418033410.GE26912@jamessan.com> Message-ID: Your message dated Thu, 17 Apr 2008 23:34:10 -0400 with message-id <20080418033410.GE26912 at jamessan.com> and subject line Re: Bug#392186: Vim should find and highlight possible typos in your code in quickfix mode has caused the Debian Bug report #392186, regarding [vim] Find and highlight possible typos in your code in quickfix mode to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 392186: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=392186 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: "Jason Spiro" Subject: Vim should find and highlight possible typos in your code in quickfix mode Date: Tue, 10 Oct 2006 12:40:37 -0400 Size: 2801 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080418/2006620a/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Re: Bug#392186: Vim should find and highlight possible typos in your code in quickfix mode Date: Thu, 17 Apr 2008 23:34:10 -0400 Size: 3079 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080418/2006620a/attachment-0001.eml From export at fane.fr Fri Apr 18 09:02:29 2008 From: export at fane.fr (Globecom Editeur du FANE) Date: Fri, 18 Apr 2008 11:02:29 +0200 Subject: Testez gratuitement notre guide des exportateurs Message-ID: Vous souhaitez d?velopper vos ventes ? l?exportation ? En Afrique et Moyen Orient ? En Am?rique du Sud ? En Asie ? En Europe de l?Est ? La confiance, ?a se gagne ! Testez gratuitement notre support papier sur l??dition de votre choix ! (1/8 de page, hors frais techniques, offre limit?e aux 30 premiers nouveaux inscrits, enregistr?s d?ici 10 jours). Qui sommes nous? Editeur du FANE : guide d?exportateurs bilingue diffus? dans toute l?Afrique, le Moyen Orient, l?Am?rique du Sud, l?Asie et l?Europe de l?Est Quel est notre objectif? Indiquer aux acheteurs des continents ?mergeants une liste de fournisseurs souhaitant d?velopper des relations d?affaires avec leur pays. Qui peut ?tre pr?sent dans le guide FANE? Toutes entreprises exportatrices ou d?sirant exporter Qui sont les utilisateurs du guide? Des importateurs, des distributeurs, des prescripteurs et des entreprises ou administrations ? la recherche de fournisseurs Quels sont nos atouts? 17 ann?es de diffusion avec une parution annuelle 1 r?seau de Repr?sentation Officielle dans les pays de diffusion 1 site Internet www.fane.fr appuyant le support papier avec ses 20 000 consultations mensuelles La promotion du support lors de salons internationaux (S?n?gal, Libye, Alg?rie, Cameroun, Madagascar etc. ) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080418/9a38fe9b/attachment.htm From owner at bugs.debian.org Fri Apr 18 19:54:06 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 18 Apr 2008 19:54:06 +0000 Subject: Processed: Re: Bug#370345: vim-tiny: please, use upx In-Reply-To: <20080418195153.GI26912@jamessan.com> References: <20080418195153.GI26912@jamessan.com> Message-ID: Processing commands for control at bugs.debian.org: > tag 370345 wontfix Bug#370345: [vim-tiny] Use upx compression There were no tags set. Tags added: wontfix > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From owner at bugs.debian.org Fri Apr 18 19:54:07 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 18 Apr 2008 19:54:07 +0000 Subject: Bug#370345: marked as done ([vim-tiny] Use upx compression) References: <20080418195153.GI26912@jamessan.com> <20060604182021.10691.19055.reportbug@localhost.localdomain> Message-ID: Your message dated Fri, 18 Apr 2008 15:51:53 -0400 with message-id <20080418195153.GI26912 at jamessan.com> and subject line Re: Bug#370345: vim-tiny: please, use upx has caused the Debian Bug report #370345, regarding [vim-tiny] Use upx compression to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 370345: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=370345 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Maximiliano Curia Subject: vim-tiny: please, use upx Date: Sun, 04 Jun 2006 15:20:21 -0300 Size: 2617 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080418/a116148e/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Re: Bug#370345: vim-tiny: please, use upx Date: Fri, 18 Apr 2008 15:51:53 -0400 Size: 3093 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080418/a116148e/attachment-0001.eml From jamessan at users.alioth.debian.org Sat Apr 19 14:09:34 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sat, 19 Apr 2008 14:09:34 -0000 Subject: r1251 - in /trunk/packages/vim-latexsuite/debian: changelog control Message-ID: Author: jamessan Date: Sat Apr 19 14:09:33 2008 New Revision: 1251 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1251 Log: Release 20060325-5 Modified: trunk/packages/vim-latexsuite/debian/changelog trunk/packages/vim-latexsuite/debian/control Modified: trunk/packages/vim-latexsuite/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/changelog?rev=1251&op=diff ============================================================================== --- trunk/packages/vim-latexsuite/debian/changelog (original) +++ trunk/packages/vim-latexsuite/debian/changelog Sat Apr 19 14:09:33 2008 @@ -1,18 +1,27 @@ -vim-latexsuite (20060325-5) UNRELEASED; urgency=low - - [ Stefano Zacchiroli ] - * NOT RELEASED YET - * depends alternatively also on vim-nox, which includes python support - (Closes: #459957) - - [ James Vega ] +vim-latexsuite (20060325-5) unstable; urgency=low + + * Orphaning the package. Maintainer set to Debian QA Group. + * debian/vim-registry/vim-latexsuite.yaml: + - Remove the entries for the "BORKENFILES" from the registry file. + (Closes: #446080) * debian/control: - Remove the version from the vim-common Depends since it is available in etch. - - Adjust the vim variant Depends to use vim-gtk/vim-gnome instead of the - transitional vim-python/vim-full packages. - - -- James Vega Thu, 10 Jan 2008 08:45:06 -0500 + - Remove the gvim Depends alternative since all vim variant packages + Provide vim. + - Depend on vim-python | python now that all vim variant packages that + have python support Provide vim-python. (Closes: #459957) + - Bump Standards-Version to 3.7.3 -- no changes needed. + + -- James Vega Sat, 19 Apr 2008 09:20:09 -0400 + +vim-latexsuite (20060325-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Delete the broken files in the installation directory, not in the source + tree, which fixes the double-build FTBFS (Closes: #441730). + + -- Cyril Brulebois Sat, 29 Sep 2007 18:32:11 +0200 vim-latexsuite (20060325-4) unstable; urgency=low Modified: trunk/packages/vim-latexsuite/debian/control URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/control?rev=1251&op=diff ============================================================================== --- trunk/packages/vim-latexsuite/debian/control (original) +++ trunk/packages/vim-latexsuite/debian/control Sat Apr 19 14:09:33 2008 @@ -1,17 +1,16 @@ Source: vim-latexsuite Section: editors Priority: extra -Maintainer: Debian VIM Maintainers -Uploaders: Stefano Zacchiroli , Franz Pletz +Maintainer: Debian QA Group Build-Depends: debhelper (>> 5), dpatch -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Homepage: http://vim-latex.sourceforge.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim-latexsuite Vcs-Browser: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/ Package: vim-latexsuite Architecture: all -Depends: vim-common, vim | gvim, vim-gtk | vim-nox | vim-gnome | python +Depends: vim-common, vim, vim-python | python Recommends: tetex-bin | texlive-base-bin, vim-addon-manager Suggests: xpdf | pdf-viewer, gv | postscript-viewer Description: view, edit and compile LaTeX documents from within Vim From jamessan at users.alioth.debian.org Sat Apr 19 14:10:43 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sat, 19 Apr 2008 14:10:43 -0000 Subject: r1252 - /tags/packages/vim-latexsuite/20060325-5/ Message-ID: Author: jamessan Date: Sat Apr 19 14:10:43 2008 New Revision: 1252 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1252 Log: [svn-buildpackage] Tagging vim-latexsuite (20060325-5) Added: tags/packages/vim-latexsuite/20060325-5/ - copied from r1251, trunk/packages/vim-latexsuite/ From jamessan at debian.org Sat Apr 19 14:17:03 2008 From: jamessan at debian.org (James Vega) Date: Sat, 19 Apr 2008 14:17:03 +0000 Subject: Accepted vim-latexsuite 20060325-5 (source all) Message-ID: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Sat, 19 Apr 2008 09:20:09 -0400 Source: vim-latexsuite Binary: vim-latexsuite Architecture: source all Version: 20060325-5 Distribution: unstable Urgency: low Maintainer: jamessan at debian.org Changed-By: James Vega Description: vim-latexsuite - view, edit and compile LaTeX documents from within Vim Closes: 446080 459957 Changes: vim-latexsuite (20060325-5) unstable; urgency=low . * Orphaning the package. Maintainer set to Debian QA Group. * debian/vim-registry/vim-latexsuite.yaml: - Remove the entries for the "BORKENFILES" from the registry file. (Closes: #446080) * debian/control: - Remove the version from the vim-common Depends since it is available in etch. - Remove the gvim Depends alternative since all vim variant packages Provide vim. - Depend on vim-python | python now that all vim variant packages that have python support Provide vim-python. (Closes: #459957) - Bump Standards-Version to 3.7.3 -- no changes needed. Checksums-Sha1: 720e603f34210fb1f908af15a2d2f8b2ad77a807 1231 vim-latexsuite_20060325-5.dsc 4ce187b67a3b0f4379f7c2a8302f6720b7369a35 76786 vim-latexsuite_20060325-5.diff.gz a0bd6e201021a8988f02f3b2375062bdbffe775c 298868 vim-latexsuite_20060325-5_all.deb Checksums-Sha256: 7140f401d3ce6e6166994dd8d80f98d4aaffb8b2ebfcf0816476622c517fc92c 1231 vim-latexsuite_20060325-5.dsc 8b7ff8fdc7ef4f5b84239d40e57268a1d818ef688bff1bdf09b2b3ea2d59cc99 76786 vim-latexsuite_20060325-5.diff.gz 2bad0ee5bb14601572e855ea6d283ce7437f39a0333bfe9f2359ed62a332f94e 298868 vim-latexsuite_20060325-5_all.deb Files: 635085bf4c34c167ad3dfb433d9af8e4 1231 editors extra vim-latexsuite_20060325-5.dsc 5ee983d476c78418477ebf44d86a68b1 76786 editors extra vim-latexsuite_20060325-5.diff.gz fc3f77bfb13af1333b9ff940dfcc8c31 298868 editors extra vim-latexsuite_20060325-5_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iEYEARECAAYFAkgJ/YoACgkQDb3UpmEybUCHNACeP/VVPVj87HMgZDGYfLozYyTu imkAn30PwCqTi/6PtZ9f+OKIDTFbsUVa =9QZn -----END PGP SIGNATURE----- Accepted: vim-latexsuite_20060325-5.diff.gz to pool/main/v/vim-latexsuite/vim-latexsuite_20060325-5.diff.gz vim-latexsuite_20060325-5.dsc to pool/main/v/vim-latexsuite/vim-latexsuite_20060325-5.dsc vim-latexsuite_20060325-5_all.deb to pool/main/v/vim-latexsuite/vim-latexsuite_20060325-5_all.deb From owner at bugs.debian.org Sat Apr 19 14:33:06 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 19 Apr 2008 14:33:06 +0000 Subject: Bug#453898: marked as done (installs broken latex-suite symlinks) References: <47523082.8020004@connect2.com> Message-ID: Your message dated Sat, 19 Apr 2008 14:17:03 +0000 with message-id and subject line Bug#446080: fixed in vim-latexsuite 20060325-5 has caused the Debian Bug report #446080, regarding installs broken latex-suite symlinks to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 446080: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=446080 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Daniel Nelson Subject: installs broken latex-suite symlinks Date: Sat, 01 Dec 2007 21:11:46 -0700 Size: 2247 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/ca74d654/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#446080: fixed in vim-latexsuite 20060325-5 Date: Sat, 19 Apr 2008 14:17:03 +0000 Size: 4548 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/ca74d654/attachment-0001.eml From owner at bugs.debian.org Sat Apr 19 14:33:06 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 19 Apr 2008 14:33:06 +0000 Subject: Bug#453898: marked as done (installs broken latex-suite symlinks) References: <47523082.8020004@connect2.com> Message-ID: Your message dated Sat, 19 Apr 2008 14:17:03 +0000 with message-id and subject line Bug#446080: fixed in vim-latexsuite 20060325-5 has caused the Debian Bug report #446080, regarding installs broken latex-suite symlinks to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 446080: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=446080 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Daniel Nelson Subject: installs broken latex-suite symlinks Date: Sat, 01 Dec 2007 21:11:46 -0700 Size: 2247 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/ca74d654/attachment-0006.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#446080: fixed in vim-latexsuite 20060325-5 Date: Sat, 19 Apr 2008 14:17:03 +0000 Size: 4548 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/ca74d654/attachment-0007.eml From owner at bugs.debian.org Sat Apr 19 14:33:07 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 19 Apr 2008 14:33:07 +0000 Subject: Bug#459957: marked as done (vim-latexsuite: Can depend on vim-nox.) References: <20080109205645.GA13213@daltrey.subvert.org.uk> Message-ID: Your message dated Sat, 19 Apr 2008 14:17:03 +0000 with message-id and subject line Bug#459957: fixed in vim-latexsuite 20060325-5 has caused the Debian Bug report #459957, regarding vim-latexsuite: Can depend on vim-nox. to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 459957: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=459957 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: "Benjamin M. A'Lee" Subject: vim-latexsuite: Can depend on vim-nox. Date: Wed, 9 Jan 2008 20:56:45 +0000 Size: 3760 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/9d6a4e2b/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#459957: fixed in vim-latexsuite 20060325-5 Date: Sat, 19 Apr 2008 14:17:03 +0000 Size: 4523 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/9d6a4e2b/attachment-0001.eml From owner at bugs.debian.org Sat Apr 19 14:33:05 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 19 Apr 2008 14:33:05 +0000 Subject: Bug#446080: marked as done (vim-latexsuite: Broken items in addon registry) References: <20071010113853.2809.45587.reportbug@localhost.localdomain> Message-ID: Your message dated Sat, 19 Apr 2008 14:17:03 +0000 with message-id and subject line Bug#446080: fixed in vim-latexsuite 20060325-5 has caused the Debian Bug report #446080, regarding vim-latexsuite: Broken items in addon registry to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 446080: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=446080 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Hongzheng Wang Subject: vim-latexsuite: Broken items in addon registry Date: Wed, 10 Oct 2007 19:38:53 +0800 Size: 2864 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/d7a859ff/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#446080: fixed in vim-latexsuite 20060325-5 Date: Sat, 19 Apr 2008 14:17:03 +0000 Size: 4548 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/d7a859ff/attachment-0001.eml From owner at bugs.debian.org Sat Apr 19 14:33:07 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 19 Apr 2008 14:33:07 +0000 Subject: Bug#459957: marked as done (vim-latexsuite: Can depend on vim-nox.) References: <20080109205645.GA13213@daltrey.subvert.org.uk> Message-ID: Your message dated Sat, 19 Apr 2008 14:17:03 +0000 with message-id and subject line Bug#459957: fixed in vim-latexsuite 20060325-5 has caused the Debian Bug report #459957, regarding vim-latexsuite: Can depend on vim-nox. to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 459957: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=459957 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: "Benjamin M. A'Lee" Subject: vim-latexsuite: Can depend on vim-nox. Date: Wed, 9 Jan 2008 20:56:45 +0000 Size: 3760 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/9d6a4e2b/attachment-0006.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#459957: fixed in vim-latexsuite 20060325-5 Date: Sat, 19 Apr 2008 14:17:03 +0000 Size: 4523 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/9d6a4e2b/attachment-0007.eml From owner at bugs.debian.org Sat Apr 19 14:33:05 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 19 Apr 2008 14:33:05 +0000 Subject: Bug#446080: marked as done (vim-latexsuite: Broken items in addon registry) References: <20071010113853.2809.45587.reportbug@localhost.localdomain> Message-ID: Your message dated Sat, 19 Apr 2008 14:17:03 +0000 with message-id and subject line Bug#446080: fixed in vim-latexsuite 20060325-5 has caused the Debian Bug report #446080, regarding vim-latexsuite: Broken items in addon registry to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 446080: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=446080 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Hongzheng Wang Subject: vim-latexsuite: Broken items in addon registry Date: Wed, 10 Oct 2007 19:38:53 +0800 Size: 2864 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/d7a859ff/attachment-0004.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#446080: fixed in vim-latexsuite 20060325-5 Date: Sat, 19 Apr 2008 14:17:03 +0000 Size: 4548 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080419/d7a859ff/attachment-0005.eml From Greeting at Greetings.com Sun Apr 20 14:13:36 2008 From: Greeting at Greetings.com (Greetings.com) Date: Sun, 20 Apr 2008 09:13:36 -0500 (CDT) Subject: Hey, you have a new Greeting !!! Message-ID: <20080420141336.36C9C1718838@mail.usd328.org> An HTML attachment was scrubbed... URL: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/737a53a7/attachment.htm From jamessan at users.alioth.debian.org Sun Apr 20 14:43:52 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 14:43:52 -0000 Subject: r1253 - in /trunk/packages/vim-scripts: debian/changelog debian/vim-scripts.status doc/snippets_emu.txt html/index.html html/plugin_snippetsEmu.vim.html plugin/snippetsEmu.vim Message-ID: Author: jamessan Date: Sun Apr 20 14:43:52 2008 New Revision: 1253 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1253 Log: - snippetsEmu: Emulate TextMate's snippet expansion. (Closes: #473744) Added: trunk/packages/vim-scripts/doc/snippets_emu.txt trunk/packages/vim-scripts/html/plugin_snippetsEmu.vim.html trunk/packages/vim-scripts/plugin/snippetsEmu.vim Modified: trunk/packages/vim-scripts/debian/changelog trunk/packages/vim-scripts/debian/vim-scripts.status trunk/packages/vim-scripts/html/index.html Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1253&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Sun Apr 20 14:43:52 2008 @@ -7,6 +7,7 @@ Commentify, vcscommand, calendar. * New addons: - DetectIndent: Automatically detect indent settings. (Closes: #471890) + - snippetsEmu: Emulate TextMate's snippet expansion. (Closes: #473744) * Added patches: - patches/disabledby-xml.dpatch: + Do not let loaded_xml_ftplugin since that will prevent the ftplugin Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1253&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Sun Apr 20 14:43:52 2008 @@ -318,7 +318,7 @@ author_url: http://vim.sourceforge.net/account/profile.php?user_id=9429 email: fromtonrouge at gmail.com license: no license -extras: after/ftplugin/cpp.vim, after/ftplugin/c.vim, doc/omnicppcomplete.txt, autoload/omni/cpp/includes.vim, autoload/omni/cpp/tokenizer.vim, autoload/omni/cpp/maycomplete.vim, autoload/omni/cpp/namespaces.vim, autoload/omni/cpp/settings.vim, autoload/omni/cpp/utils.vim, autoload/omni/cpp/items.vim, autoload/omni/common/debug.vim, autoload/omni/common/utils.vim +extras: after/ftplugin/cpp.vim, after/ftplugin/c.vim, doc/omnicppcomplete.txt, autoload/omni/cpp/includes.vim, autoload/omni/cpp/tokenizer.vim, autoload/omni/cpp/maycomplete.vim, autoload/omni/cpp/namespaces.vim, autoload/omni/cpp/settings.vim, autoload/omni/cpp/utils.vim, autoload/omni/cpp/items.vim, autoload/omni/common/debug.vim, autoload/omni/common/utils.vim disabledby: let loaded_omnicppcomplete = 1 version: 0.41 @@ -340,7 +340,7 @@ author: Stefano Zacchiroli author_url: http://www.vim.org/account/profile.php?user_id=6957 email: zack at bononia.it -license: GNU GPL, see /usr/share/common-licenses/GPL-3 +license: GNU GPL, see /usr/share/common-licenses/GPL disabledby: let loaded_lbdbq = 1 version: 0.3 @@ -398,6 +398,18 @@ email: ciaran.mccreesh at googlemail.com license: Vim's license [4], see below version: 1.0 + +script_name: plugin/snippetsEmu.vim +addon: snippetsEmu +description: emulate TextMate's snippet expansion +script_url: http://www.vim.org/scripts/script.php?script_id=1318 +author: Felix Ingram +author_url: http://www.vim.org/account/profile.php?user_id=8005 +email: F.ingram.lists at gmail.com +license: GNU GPL, see /usr/share/common-licenses/GPL-2 +extras: doc/snippets_emu.txt +disabledby: let loaded_snippet = 1 +version: 1.2.3 -- Added: trunk/packages/vim-scripts/doc/snippets_emu.txt URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/doc/snippets_emu.txt?rev=1253&op=file ============================================================================== --- trunk/packages/vim-scripts/doc/snippets_emu.txt (added) +++ trunk/packages/vim-scripts/doc/snippets_emu.txt Sun Apr 20 14:43:52 2008 @@ -1,0 +1,354 @@ +*snippets_emu.txt* For Vim version 7.0. Last change: 2006 Dec 26 + + + VIM REFERENCE MANUAL by Panos Laganakos and Felix Ingram + + +1. SnippetsEmu Features |snippets_emu-features| + Basic Snippets |basic-snippet| + Named Tags |named-tags| + Tag Commands |snippet-commands| + Buffer Specific Snippets |snip-buffer-specific| + Filetype Specific Snippets |snip-ftplugin| + Snippets menu |snip-menu| +2. SnippetsEmu Options |snippets_emu-options| + Start and End Tags |snip-start-end-tags| + Element Delimiter |snip-start-end-tags| + Remapping the default jump key |snip-remap-key| +3. Detailed Explanations |snip-detailed-explanations| + Valid Tag Names |snip-tag-name-syntax| + Advanced Tag Command Examples |snip-advanced-tag-commands| +4. SnippetsEmu Contact Details |snip-contact-details| +5. Contributors |snip-contributors| +6. SnippetsEmu Known Bugs |snippets_emu-bugs| +7. Troubleshooting |snippets_emu-troubleshooting| + +{Vi does not have any of these features} + +============================================================================== +SNIPPETSEMU FEATURES *snippets_emu-features* + +SnippetsEmu attempts to emulate several of the snippets features of the OS X +editor TextMate, in particular the variable bouncing and replacement behaviour. +Simple usage is built up around the following functionality: + + Basic Snippet |basic-snippet| + Named Tags |named-tags| + Executable Snippet |snippet-commands| + Buffer Specific Snippets |snip-buffer-specific| + + *basic-snippet* + *:Snippet* +Basic Snippet ~ + +A basic snippet can save you a lot of typing. Define a word trigger and on +insertion it will be expanded to the full snippet. SnippetsEmu allows the +user to define markers within the larger piece of text which will be used +to place the cursor upon expansion. + +The command used to define a snippet is 'Snippet'. + +Basic Syntax: > + + :Snippet trigger_name The cursor will be placed here: <{}> Trailing text + +In insert mode typing 'trigger_name' will remove 'trigger_name' and +replace it with the text: 'The cursor will be placed here: Trailing text'. +The cursor will be placed between the two spaces before the word 'Trailing' + +NOTE: All text should be entered on the same command line. The formatting of +this document may mean that examples are wrapped but they should all be +entered on a single line. + + *named-tags* +Named tags ~ + +Instead of the simple '<{}>' tags used for cursor placement a user can define +named tags. When the value of a named tag is changed then all other tags with +that name will be changed to the same value. + +E.g. > + + :Snippet trigger My name is <{forename}> <{surname}>. Call me <{forename}>. + +In insert mode typing 'trigger' will place the cursor inside the +'<{forename}>' tag. Whatever is entered inside the tag will replace the other +similarly named tag at the end of the line after the user presses 'Tab'. + +If no value is entered for a named tag then the tag's name will be used +instead. This is one way of defining default values. + +Using the above example, entering 'trigger' and pressing 'Tab' twice +will result in the following text: > + + My name is forename surname. Please call me forename. + +The rules for what constitutes a valid tag name are explained below. See +|snip-tag-name-syntax|. + *snippet-commands* +Tag commands ~ + +Tags can contain commands. Commands can be any Vim function, including user +defined functions. + +A common example is performing substitutions. + +E.g. > + + :Snippet trigger My name is <{name}>. I SAID: MY NAME IS + <{name:substitute(@z,'.','\u&','g')}>! + +The value entered in the <{name}> tag will be passed to the command in the +second <{name}> tag in the @z register (any value already in @z will be +preserved and restored). The substitute command will change the entered value +to be in upper case. I.e. Entering 'trigger' and typing 'Tycho' +will result in the following text: > + + My name is Tycho. I SAID: MY NAME IS TYCHO! +~ + *snip-special-vars* +There is a set of special variables which can be included in snippets. These +will be replaced before the snippet's text is inserted into the buffer. The +list of available variables is detailed below: + + * SNIP_FILE_NAME - The current file name (from 'expand("%")') + * SNIP_ISO_DATE - The current date in YYYY-MM-DD format. + + *snip-snippet-commands* +In addition to tag commands it is also possible to define commands which will +be executed before the snippet is inserted into the buffer. These are defined +within double backticks. + +E.g. +> + :Snippet date The current date is ``strftime("%c")`` + +Commands are standard Vim commands and will be 'exec'uted and the command +output substituted into the text. + + *snip-buffer-specific* +Buffer Specific Snippets ~ + +The Snippet command defines buffer specific snippets. This is the recommended +option when using filetype specific snippets. It is possible to define +'global' snippets which will act across all buffers. These can be defined +using the legacy 'Iabbr' command (note the capital 'I'). + +E.g. > + Iabbr for for <{var}> in <{list}>:<{}> +~ + *snip-ftplugin* +The preferred practice for defining filetype specific snippets is to include +them in files named _snippets.vim and for these files to be placed in the +~/.vim/after/ftplugin directory (or vimfiles\after\ftplugin under Windows). +When a file of a specific type is loaded so will all of the defined snippets. +The 'after' directory is used to ensure that the plugin has been loaded. It is +also recommended that the following is included at the top of the file: > + + if !exists('loaded_snippet') || &cp + finish + endif + +This will stop errors being generated if the plugin has not loaded for any +reason. + +Users wishing to add their own filetype snippets should add them to a separate +file to ensure they are not lost when upgrading the plugin. Naming the files +_mysnippets.vim or similar is the preferred practice. + + *snip-menu* +When loading the plugin will search for all files named '*_snippets.vim'. +These will be added to the 'Snippets' menu which is available in Normal mode. +Selecting options from the menu will source the file and hence load any +snippets defined within it. + + *creating-snippets* *CreateSnippet* +[range]CreateSnippet + The CreateSnippet command allows the simple creation of + snippets for use within your own file. Without a range the + current line will be used. When passed a range then all the + lines in the range will be converted for use in a command. + + Snippets created by the command will be added to a scratch + buffer called 'Snippets'. The current value of an empty tag + (snip_start_tag.snip_end_tag, '<{}>' by default) will be added + to the unnamed register and so can be inserted with appropriate + paste commands. + + *CreateBundleSnippet* +[range]CreateBundleSnippet + CreateBundleSnippet works exactly like CreateSnippet but the + resulting text will be suitable for including in one of the + included bundles. The unnamed register will include the text + '"st.et."' so start and end tag agnostic empty tags can be + included. + +=============================================================================== +SNIPPETSEMU OPTIONS *snippets_emu-options* + *snip-start-end-tags* +Start and End Tags ~ + +By default the start and end tags are set to be '<{' and '}>'. These can be +changed by setting the following variables in vimrc: > + + g:snip_start_tag + g:snip_end_tag + +They can be also changed for a specific buffer by setting the following: > + + b:snip_start_tag + b:snip_end_tag +~ + *snip-elem-delimiter* +Element Delimiter ~ + +The value of snip_elem_delim is used to separate a tag's name and its command. +By default it is set to ':' but can be set as above either globally or for a +specific buffer using the following variables: > + + g:snip_elem_delim + b:snip_elem_delim +~ + *snip-remap-key* +Remapping the default jump key ~ + +The trigger key is mapped to Tab by default. Some people may wish to remap +this if it causes conflicts with other plugins. The key can be set in your +<.vimrc> by setting the 'g:snippetsEmu_key' variable. +An example +> + let g:snippetsEmu_key = "" + +Snippets will now be triggered by Shift-Tab rather than just Tab. NB, this +example may not work in all terminals as some trap Shift-Tab before it gets +to Vim. + +~ +============================================================================== +DETAILED EXPLANATIONS *snip-detailed-explanations* + *snip-tag-name-syntax* +Valid Tag Names ~ + +Tag names cannot contain whitespace unless they are enclosed in quotes. + +Valid Examples: > + <{validName}> + <{"valid name"}> + <{tagName:command}> + <{"Tag Name":command}> + +Invalid Examples: > + <{invalid name}> + <{Tag Name:command}> + <{:command}> + +~ + *snip-advanced-tag-commands* +Advanced Tag Command Examples ~ + +Commands in tags can be as complex as desired. Readability is the main +limitation as the command will be placed in the document before execution. + +The preferred method for defining complex commands is to hide the +functionality in a user function. + +Example: +> + + function! Count(haystack, needle) + let counter = 0 + let index = match(a:haystack, a:needle) + while index > -1 + let counter = counter + 1 + let index = match(a:haystack, a:needle, index+1) + endwhile + return counter + endfunction + + function! PyArgList(count) + if a:count == 0 + return "(,)" + else + return '('.repeat('<{}>, ', a:count).')' + endif + endfunction + + Snippet pf print "<{s}>" % <{s:PyArgList(Count(@z, '%[^%]'))}><{}> + +The above snippet will expand 'pf' to 'print "<{s}>" ...'. The user then +enters a format string. Once the string is entered the Count and PyArgList +functions are used to generate a number of empty tags. + + *snip-limitations* +The above represents once of the limitations of the plugin. Due to the way +tags are identified it is not possible to include empty tags in another tag's +command. The only way to generate empty tags is to return them from a function +as in the above example. For other examples see the included bundles. + + *snip-bundles* +The included bundles are not defined in the 'preferred style'. In order to +accommodate users who wish to redefine the default tags all snippet +definitions are 'executed' with the 'exec' command. + +E.g. +> + exec "Snippet test This isn't the right way to ".st.et." define snippets" + +Executing the command allows 'st' and 'et' to be used in place of start and +end tags. 'st' and 'et' are defined elsewhere in the bundle file. + +============================================================================== +SNIPPETSEMU CONTACT DETAILS *snip-contact-details* + +To contact the author please email: + +F Ingram lists gmail com + +The author welcomes corrections to this documentation, example snippets and +bug reports. + +The plugin is also currently hosted at Google Code: + http://code.google.com/p/snippetsemu + +Bug reports can also be posted on the hosting site: + http://code.google.com/p/snippetsemu/issues/list + + *snip-contributors* +Contributors to SnippetsEmu ~ + +Patches: +Ori Avtalion - Improvements to Snippet command +Freddy Vulto - Improved behaviour +Andy Block - Bug with commands on same line. This is why I should do better +test suites. +bzklrm - Removal of some normal commands +Priit Tamboom - Sorting out left and right mappings + +Documentation: +Panos Laganakos - Greek translation (coming soon) + +Bundles: +Panos Laganakos - Python snippets +Alex Pounds - Django snippets +Chris Lasher - Python snippets +knipknap - Python snippets +James Widman - C snippets + +============================================================================== +SNIPPETSEMU KNOWN BUGS *snippets_emu-bugs* + +Bugs are currently tracked on Google Code. Please post any you find on the +issue tracker: + http://code.google.com/p/snippetsemu/issues/list + +============================================================================== +SNIPPETSEMU TROUBLESHOOTING *snippets_emu-troubleshooting* + +Problem: Bundles are not loading. +Answer: Ensure that you have filetype plugins turned on. Include the + following in your vimrc: > + + filetype plugin on + + +vim:tw=78:sw=4:ts=8:ft=help:norl: Modified: trunk/packages/vim-scripts/html/index.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/index.html?rev=1253&op=diff ============================================================================== --- trunk/packages/vim-scripts/html/index.html (original) +++ trunk/packages/vim-scripts/html/index.html Sun Apr 20 14:43:52 2008 @@ -34,6 +34,7 @@

  • plugin/lbdbq.vim.html
  • plugin/minibufexpl.vim.html
  • plugin/project.vim.html
  • +
  • plugin/snippetsEmu.vim.html
  • plugin/sokoban.vim.html
  • plugin/supertab.vim.html
  • plugin/surround.vim.html
  • @@ -49,7 +50,7 @@
  • syntax/mkd.vim.html
  • - Page generated on Tue, 08 Apr 2008 17:12:45 -0400 + Page generated on Sun, 20 Apr 2008 10:43:03 -0400 .

    Added: trunk/packages/vim-scripts/html/plugin_snippetsEmu.vim.html URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/html/plugin_snippetsEmu.vim.html?rev=1253&op=file ============================================================================== --- trunk/packages/vim-scripts/html/plugin_snippetsEmu.vim.html (added) +++ trunk/packages/vim-scripts/html/plugin_snippetsEmu.vim.html Sun Apr 20 14:43:52 2008 @@ -1,0 +1,504 @@ + + + + + + snippetsEmu - An attempt to emulate TextMate's snippet expansion : vim online + + + + + + + + + + + + + + + + + + + + + + + + +
       sponsor Vim developmentVim logoVim Book Ad
    + + + + + + + + + + + + +

    + + + + +
    + +snippetsEmu : An attempt to emulate TextMate's snippet expansion + +
    +
    + + + + + + + +
     script karma  + Rating 1043/297, + Downloaded by 8465
    +

    + + + + + + + + + + + + + + +
    created by
    Felix Ingram
     
    script type
    utility
     
    description
    ***** IMPORTANT *****
    The plugin has now been split into two separate vimballs. The plugin itself and the bundles. This was done because bundles were updated a lot more often than the plugin itself.

    Previous users of the plugin should delete the old file when upgrading to 1.0. The name of the file changed in 0.6 and so you'll end up with two versions when unpacking the file. Remove the old version "snippetEmu.vim" from the plugin directory. The new version is called "snippetsEmu.vim". Note the extra 's'


    Homepage: http://slipperysnippets.blogspot.com/
    Issue tracker: http://code.google.com/p/snippetsemu/issues/list

    Please email me bugs or create them in the issue tracker.

    This file contains some simple functions that attempt to emulate some of the behaviour of 'Snippets' from the OS X editor TextMate, in particular the variable bouncing and replacement behaviour.

    DIVING IN:

    Install the plugin, start a new perl file (as an example) and type the following in insert mode:

    for<tab><tab><tab><tab>

    You'll see the text expand and the jumping in action. Try the same again but this time type a new value for 'var' once it is selected. I.e.

    for<tab>test<tab><tab><tab>

    Notice how all the 'var's are replaced with 'test'.

    Check out the bundles and the docs for more examples of what can be done.

    *IMPORTANT*

    If you have any questions, suggestions, problems or criticisms about the plugin then please, please email me and I will do the best to help.
     
    install details
    Firstly create an 'after/ftplugin' directory in your vim home (e.g. ~/.vim/after/ftplugin under unix or vimfiles/after/ftplugin under Windows). This is required as Vimball sometimes does not create it for some reason.

    Download the plugin vimball (and the bundle vimball if you would like the default snippets).

    Now open the Vimball(s) with Vim and follow the instructions (source the vimball to install everything). Vimball should create the help tags. Do a :helptags on your doc directory if it hasn't.

    Enjoy
     
    + + +

    + + + + + + +
    rate this script + Life Changing + Helpful + Unfulfilling  + +
    +
    +script versions (upload new version) +

    +Click on the package to download. +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    packagescript versiondateVim versionuserrelease notes
    snippy_plugin.vba1.2.32008-03-137.0Felix IngramFixed jumping bug which caused problems with tags between two named tags being missed out. (really, really uploaded new version)
    snippy_bundles.vba1.22008-03-137.0Felix IngramSmall fix to php bundle. 'php' trigger is now 'phpp'. Previous version could too easily cause conflicts when using the 'incl' snippet.
    snippy_bundles.vba1.12008-03-037.0Felix IngramUpdates to the C and HTML bundles
    snippy_bundles.vba1.02008-02-257.0Felix IngramFiletype plugins for snippetsEmu
    snippy_plugin.vba1.2.22008-02-257.0Felix IngramBug fix to plugin. Annoying window jumping sorted out. Bundles are now in a separate vimball.
    snippetsemu1.2.1.vba1.2.12007-09-307.0Felix IngramVBA file now has unix fileformat, so things should be working better. Vimball has also added fold markers, which aren't backwards compatible, so I've removed them as well.
    snippetsemu1.2.vba1.22007-09-307.0Felix IngramFinally released new version. Big change: No more messing with iskeyword. Other stuff - Commands with autocomplete, new commands for creating snippets, updated bundles. Be sure to read the docs to see what's available.
    snippetsemu1_1.vba1.12007-04-057.0Felix IngramNew version contains several bug fixes, reverts start and end tags to more 'friendly' settings and tries to address indenting issues. Snippets must now define their own 'local' indenting. Make sure you create the after/ftplugin directories as described in the installation instructions.
    SnippetsEmu_1.0.1.vba1.0.12006-12-297.0Felix IngramEven more super 1.0.1 version with Unix line endings on the Vimball so things install properly on *nix.
    SnippetsEmu_1.0.vba1.02006-12-287.0Felix IngramSuper new 1.0 version with many new features and improvements. New bundles also included.
    snippetsEmu0.6.1.vba0.6.12006-11-287.0Felix IngramQuick fix changes the line endings for the VBA to UNIX which should hopefully stop some problems people are having
    snippetsEmu0.6.vba0.62006-11-257.0Felix IngramBugs fixes as per usual but this new version includes a set of snippets bundles for use with various filetypes. Plugin is now a VimBall so everything is in one file.
    snippetEmu0.5.6.vim0.5.62006-08-297.0Felix IngramFixed several bugs from the last version including random bug which prevented snippets from starting with 's'.
    snippetEmu0.5.5.vim0.5.52006-08-147.0Felix IngramFixed various bugs: s:search_str not being defined or being buffer specific and command tag execution not working with two tags on the same line.
    snippetEmu0.5.4.vim0.5.42006-07-257.0Felix IngramTextMate compatibile mode now works under linux.
    snippetEmu0.5.3.vim0.5.32006-07-127.0Felix IngramBug fixes. Things are a lot better behaved. Edge cases should (should) work a lot better now. Highly recommended upgrade.
    snippetEmu0.5.2.vim0.5.22006-07-047.0Felix IngramMinor bug fix. Textmate compatible mode did not allow quotes in expansions. Fixed
    snippetEmu0.5.1.vim0.5.12006-07-037.0Felix IngramThis new version adds some bug fixes to the last release and adds the new functionality of being able to define multicharacter start and end tags. It is now easier to define tags which work across multiple languages.
    snippetEmu0.5.0.vim0.5.02006-07-017.0Felix IngramThis new version adds TextMate style expansions: snippets are not expanded automatically. The user must press Tab for a snippet to be expanded. Tabbing will jump between tags or insert a <Tab> if no tags are active.

    The tag syntax has changed. Default values are not supported anymore: use the tag's name instead. Commands can now be added in the first tag and unnamed tags can include commands.

    This is a test release: please send bug reports.
    snippetEmu.vim0.3.62006-01-166.0Felix IngramMinor bug fix.  Replacement values modified by commands would be passed to future commands in their modified form, rather than with the original replacement value.
    snippetEmu.vim0.3.52006-01-146.0Felix IngramFundamental change to the way the new commands feature works.  The command is now 'executed' and the result placed in the variable @z.  The intention is for the command to be a function call rather than a standard command.  I.e. using substitute() rather than :s///.  The value to be replaced is available to the function in @z (previous values of the variable are kept and restored once the command has been executed).  See the updated docs for examples.
    snippetEmu.vim0.3.12006-01-126.0Felix IngramBug fix - Non-greedy matching is now done on the command searching.
    snippetEmu.vim0.32006-01-116.0Felix IngramNew version allows commands to be included in named tags.  Experimental version - does not appear to break older functionality, however.
    snippetEmu.vim0.2.52006-01-056.0Felix IngramTag delimiters can now be set with autocommands to allow for different filetypes.  I.e. '<' and '>' for programming and '@' for HTML.
    snippetEmu.vim0.2.42006-01-056.0Felix IngramFixed a bug where certain tags were not recognised
    snippetEmu.vim0.2.32006-01-046.0Felix IngramNow works with autoindenting
    snippetEmu.vim0.2.22005-08-096.0Felix IngramBetter behaved.  Couple of bug fixes.
    snippetEmu.vim0.2.12005-08-096.0Felix IngramAdded check for the default key combo so that the user's settings aren't clobbered.
    snippetEmu.vim0.22005-08-086.0Felix IngramI've given this a full point release as it's a major rewrite.  Start and end tags can now be defined and default values can also be used.
    snippetEmu.vim0.12005-07-266.0Felix IngramInitial upload
    + +

    +
    + + + + + + + + + + + + + + + + + + + + + +
    + If you have questions or remarks about this site, visit the + vimonline development pages. + Please use this site responsibly. +
    + + Questions about Vim should go + to the maillist. + Help Bram help Uganda. +
    +   +   + + + + + + +
    + SourceForge.net Logo +
    + + + + Added: trunk/packages/vim-scripts/plugin/snippetsEmu.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/plugin/snippetsEmu.vim?rev=1253&op=file ============================================================================== --- trunk/packages/vim-scripts/plugin/snippetsEmu.vim (added) +++ trunk/packages/vim-scripts/plugin/snippetsEmu.vim Sun Apr 20 14:43:52 2008 @@ -1,0 +1,973 @@ +" File: snippetsEmu.vim +" Author: Felix Ingram +" ( f.ingram.lists gmail.com ) +" Description: An attempt to implement TextMate style Snippets. Features include +" automatic cursor placement and command execution. +" $LastChangedDate$ +" Version: 1.1 +" $Revision$ +" +" This file contains some simple functions that attempt to emulate some of the +" behaviour of 'Snippets' from the OS X editor TextMate, in particular the +" variable bouncing and replacement behaviour. +" +" {{{ USAGE: +" +" Place the file in your plugin directory. +" Define snippets using the Snippet command. +" Snippets are best defined in the 'after' subdirectory of your Vim home +" directory ('~/.vim/after' on Unix). Filetype specific snippets can be defined +" in '~/.vim/after/ftplugin/_snippets.vim. Using the argument will +" By default snippets are buffer specific. To define general snippets available +" globally use the 'Iabbr' command. +" +" Example One: +" Snippet fori for <{datum}> in <{data}>:<{datum}>.<{}> +" +" The above will expand to the following (indenting may differ): +" +" for <{datum}> in <{data}>: +" <{datum}>.<{}> +" +" The cursor will be placed after the first '<{' in insert mode. +" Pressing will 'tab' to the next place marker (<{data}>) in +" insert mode. Adding text between <{ and }> and then hitting <{Tab}> will +" remove the angle brackets and replace all markers with a similar identifier. +" +" Example Two: +" With the cursor at the pipe, hitting will replace: +" for <{MyVariableName|datum}> in <{data}>: +" <{datum}>.<{}> +" +" with (the pipe shows the cursor placement): +" +" for MyVariableName in <{data}>: +" MyVariableName.<{}> +" +" Enjoy. +" +" For more information please see the documentation accompanying this plugin. +" +" Additional Features: +" +" Commands in tags. Anything after a ':' in a tag will be run with Vim's +" 'execute' command. The value entered by the user (or the tag name if no change +" has been made) is passed in the @z register (the original contents of the +" register are restored once the command has been run). +" +" Named Tags. Naming a tag (the <{datum}> tag in the example above) and changing +" the value will cause all other tags with the same name to be changed to the +" same value (as illustrated in the above example). Not changing the value and +" hitting will cause the tag's name to be used as the default value. +" +" Test tags for pattern matching: +" The following are examples of valid and invalid tags. Whitespace can only be +" used in a tag name if the name is enclosed in quotes. +" +" Valid tags +" <{}> +" <{tagName}> +" <{tagName:command}> +" <{"Tag Name"}> +" <{"Tag Name":command}> +" +" Invalid tags, random text +" <{:}> +" <{:command}> +" <{Tag Name}> +" <{Tag Name:command}> +" <{"Tag Name":}> +" <{Tag }> +" <{OpenTag +" +" Here's our magic search term (assumes '<{',':' and '}>' as our tag delimiters: +" <{\([^[:punct:] \t]\{-}\|".\{-}"\)\(:[^}>]\{-1,}\)\?}> +" }}} + +if v:version < 700 + echomsg "snippetsEmu plugin requires Vim version 7 or later" + finish +endif + +if globpath(&rtp, 'plugin/snippetEmu.vim') != "" + call confirm("It looks like you've got an old version of snippetsEmu installed. Please delete the file 'snippetEmu.vim' from the plugin directory. Note lack of 's'") +endif + +let s:debug = 0 +let s:Disable = 0 + +function! s:Debug(func, text) + if exists('s:debug') && s:debug == 1 + echom "Snippy: ".a:func.": ".a:text + endif +endfunction + +if (exists('loaded_snippet') || &cp) && !s:debug + finish +endif + +"call s:Debug("","Started the plugin") + +let loaded_snippet=1 +" {{{ Set up variables +if !exists("g:snip_start_tag") + let g:snip_start_tag = "<{" +endif + +if !exists("g:snip_end_tag") + let g:snip_end_tag = "}>" +endif + +if !exists("g:snip_elem_delim") + let g:snip_elem_delim = ":" +endif + +if !exists("g:snippetsEmu_key") + let g:snippetsEmu_key = "" +endif + +"call s:Debug("", "Set variables") + +" }}} +" {{{ Set up menu +for def_file in split(globpath(&rtp, "after/ftplugin/*_snippets.vim"), '\n') + "call s:Debug("","Adding ".def_file." definitions to menu") + let snip = substitute(def_file, '.*[\\/]\(.*\)_snippets.vim', '\1', '') + exec "nmenu S&nippets.".snip." :source ".def_file."" +endfor +" }}} +" {{{ Sort out supertab +function! s:GetSuperTabSNR() + let a_sav = @a + redir @a + exec "silent function" + redir END + let funclist = @a + let @a = a_sav + try + let func = split(split(matchstr(funclist,'.SNR.\{-}SuperTab(command)'),'\n')[-1])[1] + return matchlist(func, '\(.*\)S')[1] + catch /E684/ + endtry + return "" +endfunction + +function! s:SetupSupertab() + if !exists('s:supInstalled') + let s:supInstalled = 0 + endif + if s:supInstalled == 1 || globpath(&rtp, 'plugin/supertab.vim') != "" + "call s:Debug("SetupSupertab", "Supertab installed") + let s:SupSNR = s:GetSuperTabSNR() + let s:supInstalled = 1 + if s:SupSNR != "" + let s:done_remap = 1 + else + let s:done_remap = 0 + endif + endif +endfunction + +call s:SetupSupertab() +" }}} +" {{{ Map Jumper to the default key if not set already +function! s:SnipMapKeys() + if (!hasmapto('Jumper','i')) + if s:supInstalled == 1 + exec 'imap '.g:snippetsEmu_key.' Jumper' + else + exec 'imap '.g:snippetsEmu_key.' Jumper' + endif + endif + + if (!hasmapto( 'i'.g:snippetsEmu_key, 's')) + exec 'smap '.g:snippetsEmu_key.' i'.g:snippetsEmu_key + endif + imap ".st.et +exec "Snippet title ".st.et."" +exec "Snippet body ".st.et."".st.et +exec "Snippet scriptsrc ".st.et +exec "Snippet textarea ".st.et +exec "Snippet meta ".st.et +exec "Snippet movie classid=\"clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B\"codebase=\"http://www.apple.com/qtactivex/qtplugin.cab\">value=\"".st.et."\" />width=\"".st.et."\" height=\"".st.et."\"controller=\"".st.et."\" autoplay=\"".st.et."\"scale=\"tofit\" cache=\"true\"pluginspage=\"http://www.apple.com/quicktime/download/\"/>".st.et +exec "Snippet div
    ".st.et."
    ".st.et +exec "Snippet mailto ".st.et."".st.et +exec "Snippet table
    ".st.et."
    ".st.et."
    " +exec "Snippet link " +exec "Snippet form
    ".st.et."

    ".st.et +exec "Snippet ref ".st.et."".st.et +exec "Snippet h1

    ".st.et."

    ".st.et +exec "Snippet input ".st.et +exec "Snippet style ".st.et +exec "Snippet base ".st.et Added: trunk/packages/vim-scripts/after/ftplugin/java_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/java_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/java_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/java_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,52 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +function! UpFirst() + return substitute(@z,'.','\u&','') +endfunction + +function! JavaTestFileName(type) + let filepath = expand('%:p') + let filepath = substitute(filepath, '/','.','g') + let filepath = substitute(filepath, '^.\(:\\\)\?','','') + let filepath = substitute(filepath, '\','.','g') + let filepath = substitute(filepath, ' ','','g') + let filepath = substitute(filepath, '.*test.','','') + if a:type == 1 + let filepath = substitute(filepath, '.[A-Za-z]*.java','','g') + elseif a:type == 2 + let filepath = substitute(filepath, 'Tests.java','','') + elseif a:type == 3 + let filepath = substitute(filepath, '.*\.\([A-Za-z]*\).java','\1','g') + elseif a:type == 4 + let filepath = substitute(filepath, 'Tests.java','','') + let filepath = substitute(filepath, '.*\.\([A-Za-z]*\).java','\1','g') + elseif a:type == 5 + let filepath = substitute(filepath, 'Tests.java','','') + let filepath = substitute(filepath, '.*\.\([A-Za-z]*\).java','\1','g') + let filepath = substitute(filepath, '.','\l&','') + endif + + return filepath +endfunction + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet method // {{{ ".st."method".et."/** * ".st.et." */public ".st."return".et." ".st."method".et."() {".st.et."}// }}}".st.et +exec "Snippet jps private static final ".st."string".et." ".st.et." = \"".st.et."\";".st.et +exec "Snippet jtc try {".st.et."} catch (".st.et." e) {".st.et."} finally {".st.et."}".st.et +exec "Snippet jlog /** Logger for this class and subclasses. */protected final Log log = LogFactory.getLog(getClass());".st.et +exec "Snippet jpv private ".st."string".et." ".st.et.";".st.et +exec "Snippet bean // {{{ set".st."fieldName:UpFirst()".et."/** * Setter for ".st."fieldName".et.". * @param new".st."fieldName:UpFirst()".et." new value for ".st."fieldName".et." */public void set".st."fieldName:UpFirst()".et."(".st."String".et." new".st."fieldName:UpFirst()".et.") {".st."fieldName".et." = new".st."fieldName:UpFirst()".et.";}// }}}// {{{ get".st."fieldName:UpFirst()".et."/** * Getter for ".st."fieldName".et.". * @return ".st."fieldName".et." */public ".st."String".et." get".st."fieldName:UpFirst()".et."() {return ".st."fieldName".et.";}// }}}".st.et +exec "Snippet jwh while (".st.et.") { // ".st.et."".st.et."}".st.et +exec "Snippet sout System.out.println(\"".st.et."\");".st.et +exec "Snippet jtest package ".st."j:JavaTestFileName(1)".et."import junit.framework.TestCase;import ".st."j:JavaTestFileName(2)".et.";/** * ".st."j:JavaTestFileName(3)".et." * * @author ".st.et." * @since ".st.et." */public class ".st."j:JavaTestFileName(3)".et." extends TestCase {private ".st."j:JavaTestFileName(4)".et." ".st."j:JavaTestFileName(5)".et.";public ".st."j:JavaTestFileName(4)".et." get".st."j:JavaTestFileName(4)".et."() { return this.".st."j:JavaTestFileName(5)".et."; }public void set".st."j:JavaTestFileName(4)".et."(".st."j:JavaTestFileName(4)".et." ".st."j:JavaTestFileName(5)".et.") { this.".st."j:JavaTestFileName(5)".et." = ".st."j:JavaTestFileName(5)".et."; }public void test".st.et."() {".st.et."}}".st.et +exec "Snippet jif if (".st.et.") { // ".st.et."".st.et."}".st.et +exec "Snippet jelse if (".st.et.") { // ".st.et."".st.et."} else { // ".st.et."".st.et."}".st.et +exec "Snippet jpm /** * ".st.et." * * @param ".st.et." ".st.et." * ".st.et." ".st.et." */private ".st."void".et." ".st.et."(".st."String".et." ".st.et.") {".st.et."}".st.et +exec "Snippet main public main static void main(String[] ars) {".st."\"System.exit(0)\"".et.";}".st.et +exec "Snippet jpum /** * ".st.et." * * @param ".st.et." ".st.et." *".st.et." ".st.et." */public ".st."void".et." ".st.et."(".st."String".et." ".st.et.") {".st.et."}".st.et +exec "Snippet jcout ".st.et Added: trunk/packages/vim-scripts/after/ftplugin/javascript_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/javascript_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/javascript_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/javascript_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,10 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet proto ".st."className".et.".prototype.".st."methodName".et." = function(".st.et."){".st.et."};".st.et +exec "Snippet fun function ".st."functionName".et." (".st.et."){".st.et."}".st.et Added: trunk/packages/vim-scripts/after/ftplugin/latex_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/latex_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/latex_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/latex_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,13 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet sub \\subsection{".st."name".et."}\\label{sub:".st."name:substitute(@z,'.','\\l&','g')".et."}".st.et +exec "Snippet $$ \\[".st.et."\\]".st.et +exec "Snippet ssub \\subsubsection{".st."name".et."}\\label{ssub:".st."name:substitute(@z,'.','\\l&','g')".et."}".st.et +exec "Snippet itd \\item[".st."desc".et."] ".st.et +exec "Snippet sec \\section{".st."name".et."}\\label{sec:".st."name:substitute(@z,'.','\\l&','g')".et."}".st.et Added: trunk/packages/vim-scripts/after/ftplugin/logo_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/logo_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/logo_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/logo_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,9 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet to to ".st."name".et." ".st."argument".et."".st.et."end".st.et Added: trunk/packages/vim-scripts/after/ftplugin/markdown_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/markdown_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/markdown_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/markdown_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,10 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet img ![".st."altText".et."](".st."SRC".et.")".st.et +exec "Snippet link [".st."desc".et."](".st."HREF".et.")".st.et Added: trunk/packages/vim-scripts/after/ftplugin/movable_type_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/movable_type_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/movable_type_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/movable_type_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,14 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet cat <$MTCategoryDescription$>".st.et +exec "Snippet blog <$MTBlogName$>".st.et +exec "Snippet archive <$MTArchiveFile$>".st.et +exec "Snippet cal ".st.et."".st.et +exec "Snippet entry <$MTEntryMore$>".st.et +exec "Snippet entries ".st.et."".st.et Added: trunk/packages/vim-scripts/after/ftplugin/objc_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/objc_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/objc_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/objc_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,53 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +function! UpFirst() + return substitute(@z,'.','\u&','') +endfunction + +function! Count(haystack, needle) + let counter = 0 + let index = match(a:haystack, a:needle) + while index > -1 + let counter = counter + 1 + let index = match(a:haystack, a:needle, index+1) + endwhile + return counter +endfunction + +function! ObjCArgList(count) + let st = g:snip_start_tag + let et = g:snip_end_tag + + if a:count == 0 + return st.et + else + return st.et.repeat(', '.st.et, a:count) + endif +endfunction + + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet cat @interface ".st."NSObject".et." (".st."Category".et.")@end@implementation ".st."NSObject".et." (".st."Category".et.")".st.et."@end".st.et +exec "Snippet delacc - (id)delegate;- (void)setDelegate:(id)delegate;".st.et +exec "Snippet ibo IBOutlet ".st."NSSomeClass".et." *".st."someClass".et.";".st.et +exec "Snippet dict NSMutableDictionary *".st."dict".et." = [NSMutableDictionary dictionary];".st.et +exec "Snippet Imp #import <".st.et.".h>".st.et +exec "Snippet objc @interface ".st."class".et." : ".st."NSObject".et."{}@end@implementation ".st."class".et."- (id)init{self = [super init]; if (self != nil){".st.et."}return self;}@end".st.et +exec "Snippet imp #import \"".st.et.".h\"".st.et +exec "Snippet bez NSBezierPath *".st."path".et." = [NSBezierPath bezierPath];".st.et +exec "Snippet acc - (".st."\"unsigned int\"".et.")".st."thing".et."{return ".st."fThing".et.";}- (void)set".st."thing:UpFirst()".et.":(".st."\"unsigned int\"".et.")new".st."thing:UpFirst()".et."{".st."fThing".et." = new".st."thing:UpFirst()".et.";}".st.et +exec "Snippet format [NSString stringWithFormat:@\"".st.et."\", ".st.et."]".st.et +exec "Snippet focus [self lockFocus];".st.et."[self unlockFocus];".st.et +exec "Snippet setprefs [[NSUserDefaults standardUserDefaults] setObject:".st."object".et." forKey:".st."key".et."];".st.et +exec "Snippet log NSLog(@\"%s".st."s".et."\", ".st."s:ObjCArgList(Count(@z, '%[^%]'))".et.");".st.et +exec "Snippet gsave [NSGraphicsContext saveGraphicsState];".st.et."[NSGraphicsContext restoreGraphicsState];".st.et +exec "Snippet forarray for(unsigned int index = 0; index < [".st."array".et." count]; index += 1){".st."id".et."object = [".st."array".et." objectAtIndex:index];".st.et."}".st.et +exec "Snippet classi @interface ".st."ClassName".et." : ".st."NSObject".et."{".st.et."}".st.et."@end".st.et +exec "Snippet array NSMutableArray *".st."array".et." = [NSMutableArray array];".st.et +exec "Snippet getprefs [[NSUserDefaults standardUserDefaults] objectForKey:];".st.et +exec "Snippet cati @interface ".st."NSObject".et." (".st."Category".et.")".st.et."@end".st.et Added: trunk/packages/vim-scripts/after/ftplugin/ocaml_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/ocaml_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/ocaml_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/ocaml_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,26 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet Queue Queue.fold ".st.et." ".st."base".et." ".st."q".et."".st.et +exec "Snippet Nativeint Nativeint.abs ".st."ni".et.st.et +exec "Snippet Printexc Printexc.print ".st."fn".et." ".st."x".et.st.et +exec "Snippet Sys Sys.Signal_ignore".st.et +exec "Snippet Hashtbl Hashtbl.iter ".st.et." ".st."h".et.st.et +exec "Snippet Array Array.map ".st.et." ".st."arr".et.st.et +exec "Snippet Printf Printf.fprintf ".st."buf".et." \"".st."format".et."\" ".st."args".et.st.et +exec "Snippet Stream Stream.iter ".st.et." ".st."stream".et.st.et +exec "Snippet Buffer Buffer.add_channel ".st."buf".et." ".st."ic".et." ".st."len".et.st.et +exec "Snippet Int32 Int32.abs ".st."i32".et.st.et +exec "Snippet List List.rev_map ".st.et." ".st."lst".et.st.et +exec "Snippet Scanf Scanf.bscaf ".st."sbuf".et." \"".st."format".et."\" ".st."f".et.st.et +exec "Snippet Int64 Int64.abs ".st."i64".et.st.et +exec "Snippet Map Map.Make ".st.et +exec "Snippet String String.iter ".st.et." ".st."str".et.st.et +exec "Snippet Genlex Genlex.make_lexer ".st."\"tok_lst\"".et." ".st."\"char_stream\"".et.st.et +exec "Snippet for for ".st."i}".et." = ".st.et." to ".st.et." do".st.et."done".st.et +exec "Snippet Stack Stack.iter ".st.et." ".st."stk".et.st.et Added: trunk/packages/vim-scripts/after/ftplugin/perl_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/perl_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/perl_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/perl_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,23 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet sub sub ".st."FunctionName".et." {".st.et."}".st.et +exec "Snippet class package ".st."ClassName".et.";".st.et.st."ParentClass".et.st.et.";sub new {my \$class = shift;\$class = ref \$class if ref \$class;my $self = bless {}, \$class;\$self;}1;".st.et +exec "Snippet xfore ".st."expression".et." foreach @".st."array".et.";".st.et +exec "Snippet xwhile ".st."expression".et." while ".st."condition".et.";".st.et +exec "Snippet xunless ".st."expression".et." unless ".st."condition".et.";".st.et +exec "Snippet slurp my $".st."var".et.";{ local $/ = undef; local *FILE; open FILE, \"<".st."file".et.">\"; $".st."var".et." = ; close FILE }".st.et +exec "Snippet if if (".st.et.") {".st.et."}".st.et +exec "Snippet unless unless (".st.et.") {".st.et."}".st.et +exec "Snippet ifee if (".st.et.") {".st.et."} elsif (".st.et.") {".st.et."} else {".st.et."}".st.et +exec "Snippet ife if (".st.et.") {".st.et."} else {".st.et."}".st.et +exec "Snippet for for (my \$".st."var".et." = 0; \$".st."var".et." < ".st."expression".et."; \$".st."var".et."++) {".st.et."}".st.et +exec "Snippet fore foreach my \$".st."var".et." (@".st."array".et.") {".st.et."}".st.et +exec "Snippet eval eval {".st.et."};if ($@) {".st.et."}".st.et +exec "Snippet while while (".st.et.") {".st.et."}".st.et +exec "Snippet xif ".st."expression".et." if ".st."condition".et.";".st.et Added: trunk/packages/vim-scripts/after/ftplugin/php_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/php_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/php_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/php_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,30 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet elseif elseif ( ".st."condition".et." ){".st.et."}".st.et +exec "Snippet do do{".st.et."} while ( ".st.et." );".st.et +exec "Snippet reql require_once( '".st."file".et."' );".st.et +exec "Snippet if? $".st."retVal".et." = ( ".st."condition".et." ) ? ".st."a".et." : ".st."b".et." ;".st.et +exec "Snippet phpp ".st.et."?>" +exec "Snippet switch switch ( ".st."variable".et." ){case '".st."value".et."':".st.et."break;".st.et."default:".st.et."break;}".st.et +exec "Snippet class #doc#classname:".st."ClassName".et."#scope:".st."PUBLIC".et."##/docclass ".st."ClassName".et." ".st."extendsAnotherClass".et."{#internal variables#Constructorfunction __construct ( ".st."argument".et."){".st.et."}###}###".st.et +exec "Snippet incll include_once( '".st."file".et."' );".st.et +exec "Snippet incl include( '".st."file".et."' );".st.et +exec "Snippet foreach foreach( $".st."variable".et." as $".st."key".et." => $".st."value".et." ){".st.et."}".st.et +exec "Snippet ifelse if ( ".st."condition".et." ){".st.et."}else{".st.et."}".st.et +exec "Snippet $_ $_REQUEST['".st."variable".et."']".st.et +exec "Snippet case case '".st."variable".et."':".st.et."break;".st.et +exec "Snippet print print \"".st."string".et."\"".st.et.";".st.et."".st.et +exec "Snippet function ".st."public".et."function ".st."FunctionName".et." (".st.et."){".st.et."}".st.et +exec "Snippet if if ( ".st."condition".et." ){".st.et."}".st.et +exec "Snippet else else{".st.et."}".st.et +exec "Snippet array $".st."arrayName".et." = array( '".st.et."',".st.et." );".st.et +exec "Snippet -globals $GLOBALS['".st."variable".et."']".st.et.st."something".et.st.et.";".st.et +exec "Snippet req require( '".st."file".et."' );".st.et +exec "Snippet for for ( $".st."i".et."=".st.et."; $".st."i".et." < ".st.et."; $".st."i".et."++ ){ ".st.et."}".st.et +exec "Snippet while while ( ".st.et." ){".st.et."}".st.et Added: trunk/packages/vim-scripts/after/ftplugin/phpdoc_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/phpdoc_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/phpdoc_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/phpdoc_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,19 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet doc_d /*** ".st."undocumentedConstant".et."**/define(".st.et.", ".st.et.");".st.et."".st.et +exec "Snippet doc_vp /*** ".st."undocumentedClassVariable".et."** @var ".st."string".et.st.et."**/".st.et."" +exec "Snippet doc_f /*** ".st."undocumentedFunction".et."** @return ".st."void".et."* @author ".st.et."**/".st.et."function ".st.et."(".st.et."){".st.et."}".st.et +exec "Snippet doc_s /*** ".st."undocumentedFunction".et."** @return ".st."void".et."* @author ".st.et."**/".st.et."function ".st.et."(".st.et.");".st.et +exec "Snippet doc_h /*** ".st.et."** @author ".st.et."* @version $Id$* @copyright ".st.et.", ".st.et."* @package ".st."default".et."**//*** Define DocBlock**/".st.et +exec "Snippet doc_fp /*** ".st."undocumentedFunction".et."** @return ".st."void".et."* @author ".st.et."**/".st.et."" +exec "Snippet doc_i /*** ".st."undocumentedClass".et."** @package ".st."default".et."* @author ".st.et."**/interface ".st.et."{".st.et."} // END interface ".st.et."".st.et +exec "Snippet doc_fp /*** ".st."undocumentedConstant".et.st.et."**/".st.et."".st.et +exec "Snippet doc_v /*** ".st."undocumentedClassVariable".et."** @var ".st."string".et."**/ $".st.et.";".st.et."".st.et +exec "Snippet doc_cp /*** ".st."undocumentedClass".et."** @package ".st."default".et."* @author ".st.et."**/".st.et +exec "Snippet doc_c /*** ".st."undocumentedClass".et."** @package ".st."default".et."* @author ".st.et."**/".st."class".et."class ".st."a".et."{".st.et."} // END ".st."class".et."class ".st."a".et."".st.et Added: trunk/packages/vim-scripts/after/ftplugin/propel_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/propel_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/propel_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/propel_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,14 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet ".st.et +exec "Snippet ".st.et."".st.et +exec "Snippet
    ".st.et +exec "Snippet ".st.et +exec "Snippet

    ".st.et +exec "Snippet \"/>".st.et Added: trunk/packages/vim-scripts/after/ftplugin/python_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/python_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/python_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/python_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,202 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +" Given a string containing a list of arguments (e.g. "one, two = 'test'"), +" this function cleans it up by removing useless whitespace and commas. +function! PyCleanupArgs(text) + if a:text == 'args' + return '' + endif + let text = substitute(a:text, '\(\w\)\s\(\w\)', '\1,\2', 'g') + return join(split(text, '\s*,\s*'), ', ') +endfunction + +" Given a string containing a list of arguments (e.g. "one = 'test', *args, +" **kwargs"), this function returns a string containing only the variable +" names, separated by spaces, e.g. "one two". +function! PyGetVarnamesFromArgs(text) + let text = substitute(a:text, 'self,*\s*', '', '') + let text = substitute(text, '\*\*\?\k\+', '', 'g') + let text = substitute(text, '=.\{-},', '', 'g') + let text = substitute(text, '=.\{-}$', '', 'g') + let text = substitute(text, '\s*,\s*', ' ', 'g') + if text == ' ' + return '' + endif + return text +endfunction + +" Returns the current indent as a string. +function! PyGetIndentString() + if &expandtab + let tabs = indent('.') / &shiftwidth + let tabstr = repeat(' ', &shiftwidth) + else + let tabs = indent('.') / &tabstop + let tabstr = '\t' + endif + return repeat(tabstr, tabs) +endfunction + +" Given a string containing a list of arguments (e.g. "one = 'test', *args, +" **kwargs"), this function returns them formatted correctly for the +" docstring. +function! PyGetDocstringFromArgs(text) + let text = PyGetVarnamesFromArgs(a:text) + if a:text == 'args' || text == '' + return '' + endif + let indent = PyGetIndentString() + let st = g:snip_start_tag + let et = g:snip_end_tag + let docvars = map(split(text), 'v:val." -- ".st.et') + return '\n'.indent.join(docvars, '\n'.indent).'\n'.indent +endfunction + +" Given a string containing a list of arguments (e.g. "one = 'test', *args, +" **kwargs"), this function returns them formatted as a variable assignment in +" the form "self._ONE = ONE", as used in class constructors. +function! PyGetVariableInitializationFromVars(text) + let text = PyGetVarnamesFromArgs(a:text) + if a:text == 'args' || text == '' + return '' + endif + let indent = PyGetIndentString() + let st = g:snip_start_tag + let et = g:snip_end_tag + let assert_vars = map(split(text), '"assert ".v:val." ".st.et') + let assign_vars = map(split(text), '"self._".v:val." = ".v:val') + let assertions = join(assert_vars, '\n'.indent) + let assignments = join(assign_vars, '\n'.indent) + return assertions.'\n'.indent.assignments.'\n'.indent +endfunction + +" Given a string containing a list of arguments (e.g. "one = 'test', *args, +" **kwargs"), this function returns them with the default arguments removed. +function! PyStripDefaultValue(text) + return substitute(a:text, '=.*', '', 'g') +endfunction + +" Returns the number of occurences of needle in haystack. +function! Count(haystack, needle) + let counter = 0 + let index = match(a:haystack, a:needle) + while index > -1 + let counter = counter + 1 + let index = match(a:haystack, a:needle, index+1) + endwhile + return counter +endfunction + +" Returns replacement if the given subject matches the given match. +" Returns the subject otherwise. +function! PyReplace(subject, match, replacement) + if a:subject == a:match + return a:replacement + endif + return a:subject +endfunction + +" Returns the % operator with a tuple containing n elements appended, where n +" is the given number. +function! PyHashArgList(count) + if a:count == 0 + return '' + endif + let st = g:snip_start_tag + let et = g:snip_end_tag + return ' % ('.st.et.repeat(', '.st.et, a:count - 1).')' +endfunction + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +" Note to users: The following method of defininf snippets is to allow for +" changes to the default tags. +" Feel free to define your own as so: +" Snippet mysnip This is the expansion text.<{}> +" There is no need to use exec if you are happy to hardcode your own start and +" end tags + +" Properties, setters and getters. +exec "Snippet prop ".st."attribute".et." = property(get_".st."attribute".et.", set_".st."attribute".et.st.et.")".st.et +exec "Snippet get def get_".st."name".et."(self):return self._".st."name".et."".st.et +exec "Snippet set def set_".st."name".et."(self, ".st."value".et."): +\self._".st."name".et." = ".st."value:PyStripDefaultValue(@z)".et." +\".st.et + +" Functions and methods. +exec "Snippet def def ".st."fname".et."(".st."args:PyCleanupArgs(@z)".et."): +\\"\"\" +\".st.et." +\".st."args:PyGetDocstringFromArgs(@z)".et."\"\"\" +\".st."pass".et." +\".st.et +exec "Snippet cm ".st."class".et." = classmethod(".st."class".et.")".st.et + +" Class definition. +exec "Snippet cl class ".st."ClassName".et."(".st."object".et."): +\\"\"\" +\This class represents ".st.et." +\\"\"\" +\ +\def __init__(self, ".st."args:PyCleanupArgs(@z)".et."): +\\"\"\" +\Constructor. +\".st."args:PyGetDocstringFromArgs(@z)".et."\"\"\" +\".st."args:PyGetVariableInitializationFromVars(@z)".et.st.et + +" Keywords +exec "Snippet for for ".st."variable".et." in ".st."ensemble".et.":".st."pass".et."".st.et +exec "Snippet pf print '".st."s".et."'".st."s:PyHashArgList(Count(@z, '%[^%]'))".et."".st.et +exec "Snippet im import ".st."module".et."".st.et +exec "Snippet from from ".st."module".et." import ".st.'name:PyReplace(@z, "name", "*")'.et."".st.et +exec "Snippet % '".st."s".et."'".st."s:PyHashArgList(Count(@z, '%[^%]'))".et.st.et +exec "Snippet ass assert ".st."expression".et.st.et +" From Kib2 +exec "Snippet bc \"\"\"".st.et."\"\"\"".st.et + +" Try, except, finally. +exec "Snippet trye try: +\".st.et." +\except Exception, e: +\".st.et." +\".st.et + +exec "Snippet tryf try: +\".st.et." +\finally: +\".st.et." +\".st.et + +exec "Snippet tryef try: +\".st.et." +\except Exception, e: +\".st.et." +\finally: +\".st.et." +\".st.et + +" Other multi statement templates +" From Panos +exec "Snippet ifn if __name__ == '".st."main".et."':".st.et +exec "Snippet ifmain if __name__ == '__main__':".st.et + +" Shebang +exec "Snippet sb #!/usr/bin/env python# -*- coding: ".st."encoding".et." -*-".st.et +exec "Snippet sbu #!/usr/bin/env python# -*- coding: UTF-8 -*-".st.et +" From Kib2 +exec "Snippet sbl1 #!/usr/bin/env python# -*- coding: Latin-1 -*-".st.et + +" Unit tests. +exec "Snippet unittest if __name__ == '__main__': +\import unittest +\ +\class ".st."ClassName".et."Test(unittest.TestCase): +\def setUp(self): +\".st."pass".et." +\ +\def runTest(self): +\".st.et Added: trunk/packages/vim-scripts/after/ftplugin/rails_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/rails_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/rails_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/rails_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,54 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet mrnt rename_table \"".st."oldTableName".et."\", \"".st."newTableName".et."\"".st.et +exec "Snippet rfu render :file => \"".st."filepath".et."\", :use_full_path => ".st."false".et.st.et +exec "Snippet rns render :nothing => ".st."true".et.", :status => ".st.et.st.et +exec "Snippet ri render :inline => \"".st.et."\")>\"".st.et +exec "Snippet rt render :text => \"".st.et."\"".st.et +exec "Snippet mcc t.column \"".st."title".et."\", :".st."string".et.st.et +exec "Snippet rpl render :partial => \"".st."item".et."\", :locals => { :".st."name".et." => \"".st."value".et."\"".st.et." }".st.et +exec "Snippet rea redirect_to :action => \"".st."index".et."\"".st.et +exec "Snippet rtlt render :text => \"".st.et."\", :layout => ".st."true".et.st.et +exec "Snippet ft <%= form_tag :action => \"".st."update".et."\" %>".st.et +exec "Snippet forin <% for ".st."item".et." in ".st.et." %><%= ".st."item".et.".".st."name".et." %><% end %>".st.et +exec "Snippet lia <%= link_to \"".st.et."\", :action => \"".st."index".et."\" %>".st.et +exec "Snippet rl render :layout => \"".st."layoutname".et."\"".st.et +exec "Snippet ra render :action => \"".st."action".et."\"".st.et +exec "Snippet mrnc rename_column \"".st."table".et."\", \"".st."oldColumnName".et."\", \"".st."newColumnName".et."\"".st.et +exec "Snippet mac add_column \"".st."table".et."\", \"".st."column".et."\", :".st."string".et.st.et +exec "Snippet rpc render :partial => \"".st."item".et."\", :collection => ".st."items".et.st.et +exec "Snippet rec redirect_to :controller => \"".st."items".et."\"".st.et +exec "Snippet rn render :nothing => ".st."true".et.st.et +exec "Snippet lic <%= link_to \"".st.et."\", :controller => \"".st.et."\" %>".st.et +exec "Snippet rpo render :partial => \"".st."item".et."\", :object => ".st."object".et.st.et +exec "Snippet rts render :text => \"".st.et."\", :status => ".st.et +exec "Snippet rcea render_component :action => \"".st."index".et."\"".st.et +exec "Snippet recai redirect_to :controller => \"".st."items".et."\", :action => \"".st."show".et."\", :id => ".st.et +exec "Snippet mcdt create_table \"".st."table".et."\" do |t|".st.et."end".st.et +exec "Snippet ral render :action => \"".st."action".et."\", :layout => \"".st."layoutname".et."\"".st.et +exec "Snippet rit render :inline => \"".st.et."\", :type => ".st.et +exec "Snippet rceca render_component :controller => \"".st."items".et."\", :action => \"".st."index".et."\"".st.et +exec "Snippet licai <%= link_to \"".st.et."\", :controller => \"".st."items".et."\", :action => \"".st."edit".et."\", :id => ".st.et." %>".st.et +exec "Snippet verify verify :only => [:".st.et."], :method => :post, :render => {:status => 500, :text => \"use HTTP-POST\"}".st.et +exec "Snippet mdt drop_table \"".st."table".et."\"".st.et +exec "Snippet rp render :partial => \"".st."item".et."\"".st.et +exec "Snippet rcec render_component :controller => \"".st."items".et."\"".st.et +exec "Snippet mrc remove_column \"".st."table".et."\", \"".st."column".et."\"".st.et +exec "Snippet mct create_table \"".st."table".et."\" do |t|".st.et."end".st.et +exec "Snippet flash flash[:".st."notice".et."] = \"".st.et."\"".st.et +exec "Snippet rf render :file => \"".st."filepath".et."\"".st.et +exec "Snippet lica <%= link_to \"".st.et."\", :controller => \"".st."items".et."\", :action => \"".st."index".et."\" %>".st.et +exec "Snippet liai <%= link_to \"".st.et."\", :action => \"".st."edit".et."\", :id => ".st.et." %>".st.et +exec "Snippet reai redirect_to :action => \"".st."show".et."\", :id => ".st.et +exec "Snippet logi logger.info \"".st.et."\"".st.et +exec "Snippet marc add_column \"".st."table".et."\", \"".st."column".et."\", :".st."string".et."".st.et."".st.et +exec "Snippet rps render :partial => \"".st."item".et."\", :status => ".st.et +exec "Snippet ril render :inline => \"".st.et."\", :locals => { ".st.et." => \"".st."value".et."\"".st.et." }".st.et +exec "Snippet rtl render :text => \"".st.et."\", :layout => \"".st.et."\"".st.et +exec "Snippet reca redirect_to :controller => \"".st."items".et."\", :action => \"".st."list".et."\"".st.et Added: trunk/packages/vim-scripts/after/ftplugin/ruby_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/ruby_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/ruby_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/ruby_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,32 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet do do".st.et."end".st.et +exec "Snippet class class ".st."className".et."".st.et."end".st.et +exec "Snippet begin begin".st.et."rescue ".st."Exception".et." => ".st."e".et."".st.et."end".st.et +exec "Snippet each_with_index0 each_with_index do |".st."element".et.", ".st."index".et."|".st."element".et.".".st.et."end".st.et +exec "Snippet collect collect { |".st."element".et."| ".st."element".et.".".st.et." }".st.et +exec "Snippet forin for ".st."element".et." in ".st."collection".et."".st."element".et.".".st.et."end".st.et +exec "Snippet doo do |".st."object".et."|".st.et."end".st.et +exec "Snippet : :".st."key".et." => \"".st."value".et."\"".st.et."".st.et +exec "Snippet def def ".st."methodName".et."".st.et."end".st.et +exec "Snippet case case ".st."object".et."when ".st."condition".et."".st.et."end".st.et +exec "Snippet collecto collect do |".st."element".et."|".st."element".et.".".st.et."end".st.et +exec "Snippet each each { |".st."element".et."| ".st."element".et.".".st.et." }".st.et +exec "Snippet each_with_index each_with_index { |".st."element".et.", ".st."idx".et."| ".st."element".et.".".st.et." }".st.et +exec "Snippet if if ".st."condition".et."".st.et."end".st.et +exec "Snippet eacho each do |".st."element".et."|".st."element".et.".".st.et."end".st.et +exec "Snippet unless unless ".st."condition".et."".st.et."end".st.et +exec "Snippet ife if ".st."condition".et."".st.et."else".st.et."end".st.et +exec "Snippet when when ".st."condition".et."".st.et +exec "Snippet selecto select do |".st."element".et."|".st."element".et.".".st.et."end".st.et +exec "Snippet injecto inject(".st."object".et.") do |".st."injection".et.", ".st."element".et."| ".st.et."end".st.et +exec "Snippet reject { |".st."element".et."| ".st."element".et.".".st.et." }".st.et +exec "Snippet rejecto reject do |".st."element".et."| ".st."element".et.".".st.et."end".st.et +exec "Snippet inject inject(".st."object".et.") { |".st."injection".et.", ".st."element".et."| ".st.et." }".st.et +exec "Snippet select select { |".st."element".et."| ".st."element".et.".".st.et." }".st.et Added: trunk/packages/vim-scripts/after/ftplugin/sh_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/sh_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/sh_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/sh_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,12 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +"Snippet !env #!/usr/bin/env ${1:${TM_SCOPE/(?:source|.*)\\.(\\w+).*/$1/}} +exec "Snippet if if [[ ".st."condition".et." ]]; then".st.et."fi".st.et +exec "Snippet elif elif [[ ".st."condition".et." ]]; then".st.et +exec "Snippet for for (( ".st."i".et." = ".st.et."; ".st."i".et." ".st.et."; ".st."i".et.st.et." )); do".st.et."done".st.et Added: trunk/packages/vim-scripts/after/ftplugin/slate_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/slate_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/slate_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/slate_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,19 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet do do: [| :".st."each".et."| ".st.et."]".st.et +exec "Snippet proto define: #".st."NewName".et." &parents: {".st."parents".et."} &slots: {".st."slotSpecs".et."}.".st.et +exec "Snippet ifte ".st."condition".et." ifTrue: [".st.et.":then] ifFalse: [".st.et.":else]".st.et +exec "Snippet collect collect: [| :".st."each".et."| ".st.et."]".st.et +exec "Snippet if ".st."condition".et." ifTrue: [".st.et.":then]".st.et +exec "Snippet until [".st."condition".et."] whileFalse: [".st.et.":body]".st.et +exec "Snippet reject reject: [| :".st."each".et."| ".st.et."]".st.et +exec "Snippet dowith doWithIndex: [| :".st."each".et." :".st."index".et." | ".st.et."]".st.et +exec "Snippet select select: [| :".st."each".et."| ".st.et."]".st.et +exec "Snippet while [".st."condition".et."] whileTrue: [".st.et.":body]".st.et +exec "Snippet inject inject: ".st."object".et." [| :".st."injection".et.", :".st."each".et."| ".st.et."]".st.et Added: trunk/packages/vim-scripts/after/ftplugin/smarty_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/smarty_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/smarty_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/smarty_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,35 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet {cycle {cycle values=\"#SELSTART#".st."foo".et.",".st."bar".et."#SELEND#\" name=\"default\" print=true advance=true delimiter=\",\" assign=varname }".st.et +exec "Snippet |regex_replace |regex_replace:\"".st."regex".et."\":\"".st.et."\"".st.et +exec "Snippet {counter {counter name=\"#INSERTION#\" start=1 skip=1 direction=\"up\" print=trueassign=\"foo\" }{counter}".st.et +exec "Snippet {eval {eval var=\"#SELSTART#{template_format}#SELEND#\" assign=varname} ".st.et +"Snippet |date_format |date_format:"${1:strftime() formatting}" <{}> +exec "Snippet |truncate |truncate:".st.et.":".st.et.":".st."false".et."" +exec "Snippet {if {if ".st."varname".et.st.et."\"".st."foo".et."\"}{* $varname can also be a php call *}".st.et."{/if}".st.et +"Snippet |string_format |string_format:"${1:sprintf formatting}" <{}> +exec "Snippet {assign {assign var=".st.et." value=\"".st.et."\"}".st.et +exec "Snippet {foreach {foreach from=".st."varname".et." item=i [key=k name=\"\"] }".st.et."{/foreach}".st.et +exec "Snippet {capture {capture name=#INSERTION#}#SELECT#{/capture}".st.et +exec "Snippet |wordwrap |wordwrap:".st.et.":\"".st.et."\":".st.et +exec "Snippet |spacify |spacify:\"".st.et."\"".st.et." " +exec "Snippet |default |default:\"".st.et."\"".st.et +exec "Snippet {debug {debug output=\"#SELSTART#".st.et."#SELEND#\" }".st.et +exec "Snippet |replace |replace:\"".st."needle".et."\":\"".st.et."\"".st.et +exec "Snippet {include {include file=\"".st.et."\" [assign=varname foo=\"bar\"] }".st.et +exec "Snippet |escape |escape:\"".st.et."\"".st.et +exec "Snippet {strip {strip}".st.et."{/strip}".st.et +exec "Snippet {math {math equation=\"".st.et."\" assign=".st.et." ".st.et."}".st.et +exec "Snippet {config_load {config_load file=\"#INSERTION#\" [section=\"\" scope=\"local|parent|global\"] }".st.et +exec "Snippet |cat |cat:\"".st.et."\"".st.et +exec "Snippet {insert {insert name=\"insert_".st.et."\" [assign=varname script=\"foo.php\" foo=\"bar\"] }".st.et +exec "Snippet {fetch {fetch file=\"#SELSTART#http:// or file#SELEND#\" assign=varname}".st.et +exec "Snippet {literal {literal}".st.et."{/literal}".st.et +exec "Snippet {include_php {include_php file=\"".st.et."\" [once=true]}".st.et +exec "Snippet |strip |strip:[\"".st.et."\"]".st.et Added: trunk/packages/vim-scripts/after/ftplugin/symfony_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/symfony_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/symfony_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/symfony_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,21 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet image_tag image_tag('".st."imageName".et."'".st.et.")".st.et +exec "Snippet get public function get".st.et." (){return $this->".st.et.";}".st.et +exec "Snippet link_to link_to('".st."linkName".et."', '".st."moduleName".et."/".st."actionName".et.st.et."')".st.et +exec "Snippet sexecute public function execute(){".st.et."}".st.et +exec "Snippet set public function set".st.et." ($".st.et."){$this->".st.et." = ".st.et.";}".st.et +exec "Snippet execute /*** ".st."className".et."**/public function execute(){".st.et."}".st.et +exec "Snippet tforeach ".st.et."".st.et +exec "Snippet getparam $this->getRequestParameter('".st."id".et."')".st.et +exec "Snippet div ".st.et."".st.et +exec "Snippet tif ".st.et."".st.et +exec "Snippet setget public function set".st."var".et." (".st."arg".et."){$this->".st."arg".et." = ".st."arg".et.";}public function get".st."var".et." (){return $this->".st."var".et.";}".st.et +exec "Snippet echo ".st.et +exec "Snippet tfor ".st.et."".st.et Added: trunk/packages/vim-scripts/after/ftplugin/tcl_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/tcl_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/tcl_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/tcl_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,14 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet switch switch ".st.et." -- $".st."var".et." {".st."match".et." {".st.et."}default{".st.et."}}".st.et +exec "Snippet foreach foreach ".st."var".et." $".st."list".et." {".st.et."}".st.et +exec "Snippet proc proc ".st."name".et." {".st."args".et."} {".st.et."}".st.et +exec "Snippet if if {".st."condition".et."} {".st.et."}".st.et +exec "Snippet for for {".st."i".et." {".st.et."} {".st.et."} {".st.et."}".st.et +exec "Snippet while while {".st."condition".et."} {".st.et."}".st.et Added: trunk/packages/vim-scripts/after/ftplugin/template_toolkit_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/template_toolkit_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/template_toolkit_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/template_toolkit_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,13 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet wrap [% WRAPPER ".st."template".et." %]".st.et."[% END %]".st.et +exec "Snippet if [% IF ".st."condition".et." %]".st.et."[% ELSE %]".st.et."[% END %]".st.et +exec "Snippet unl [% UNLESS ".st."condition".et." %]".st.et."[% END %]".st.et +exec "Snippet inc [% INCLUDE ".st."template".et." %]".st.et +exec "Snippet for [% FOR ".st."var".et." IN ".st."set".et." %]".st.et."[% END %]".st.et Added: trunk/packages/vim-scripts/after/ftplugin/tex_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/tex_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/tex_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/tex_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,13 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet sub \\subsection{".st."name".et."}\\label{sub:".st."name:substitute(@z,'.','\\l&','g')".et."}".st.et +exec "Snippet $$ \\[".st.et."\\]".st.et +exec "Snippet ssub \\subsubsection{".st."name".et."}\\label{ssub:".st."name:substitute(@z,'.','\\l&','g')".et."}".st.et +exec "Snippet itd \\item[".st."desc".et."] ".st.et +exec "Snippet sec \\section{".st."name".et."}\\label{sec:".st."name:substitute(@z,'.','\\l&','g')".et."".st.et Added: trunk/packages/vim-scripts/after/ftplugin/xhtml_snippets.vim URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/after/ftplugin/xhtml_snippets.vim?rev=1254&op=file ============================================================================== --- trunk/packages/vim-scripts/after/ftplugin/xhtml_snippets.vim (added) +++ trunk/packages/vim-scripts/after/ftplugin/xhtml_snippets.vim Sun Apr 20 14:52:54 2008 @@ -1,0 +1,48 @@ +if !exists('loaded_snippet') || &cp + finish +endif + +let st = g:snip_start_tag +let et = g:snip_end_tag +let cd = g:snip_elem_delim + +exec "Snippet doctype \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">".st.et +exec "Snippet aref ".st.et."".st.et +exec "Snippet head ".st.et."".st.et +exec "Snippet script ".st.et +exec "Snippet html lang=\"".st."en".et."\">".st.et."" +exec "Snippet h3

    ".st.et."

    ".st.et +exec "Snippet h4

    ".st.et."

    ".st.et +exec "Snippet h5
    ".st.et."
    ".st.et +exec "Snippet h6
    ".st.et."
    ".st.et +exec "Snippet fieldset
    ".st.et."
    ".st.et +exec "Snippet noscript ".st.et +exec "Snippet ul
      ".st.et."
    ".st.et +exec "Snippet xml ".st.et +exec "Snippet body ".st.et."".st.et +exec "Snippet legend ".st.et."".st.et +exec "Snippet title ".st."PageTitle".et."".st.et +exec "Snippet scriptsrc ".st.et +exec "Snippet img \"".st.et."\"".st.et +exec "Snippet option ".st.et +exec "Snippet optgroup ".st.et."".st.et +exec "Snippet meta ".st.et +exec "Snippet td ".st.et."".st.et +exec "Snippet dt
    ".st.et."
    ".st.et."
    ".st.et +exec "Snippet tfoot ".st.et."".st.et +exec "Snippet div
    ".st.et."
    ".st.et +exec "Snippet ol
      ".st.et."
    ".st.et +exec "Snippet txtarea ".st.et +exec "Snippet mailto ".st.et."".st.et +exec "Snippet table ".st.et."
    ".st.et +exec "Snippet hint ".st.et."".st.et +exec "Snippet link ".st.et +exec "Snippet form
    ".st.et."".st.et +exec "Snippet tr ".st.et."".st.et +exec "Snippet label ".st.et +exec "Snippet image \"".st.et."\"".st.et +exec "Snippet input ".st.et +exec "Snippet select ".st.et +exec "Snippet style ".st.et +exec "Snippet divheader

    ".st."CompanyName".et."

    ".st.et +exec "Snippet base ".st.et Modified: trunk/packages/vim-scripts/debian/vim-scripts.status URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/vim-scripts.status?rev=1254&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/vim-scripts.status (original) +++ trunk/packages/vim-scripts/debian/vim-scripts.status Sun Apr 20 14:52:54 2008 @@ -407,7 +407,7 @@ author_url: http://www.vim.org/account/profile.php?user_id=8005 email: F.ingram.lists at gmail.com license: GNU GPL, see /usr/share/common-licenses/GPL-2 -extras: doc/snippets_emu.txt +extras: doc/snippets_emu.txt after/ftplugin/actionscript_snippets.vim after/ftplugin/aspvbs_snippets.vim after/ftplugin/c_snippets.vim after/ftplugin/css_snippets.vim after/ftplugin/django_model_snippets.vim after/ftplugin/django_template_snippets.vim after/ftplugin/f-script_snippets.vim after/ftplugin/haskell_snippets.vim after/ftplugin/html_snippets.vim after/ftplugin/java_snippets.vim after/ftplugin/javascript_snippets.vim after/ftplugin/latex_snippets.vim after/ftplugin/logo_snippets.vim after/ftplugin/markdown_snippets.vim after/ftplugin/movable_type_snippets.vim after/ftplugin/objc_snippets.vim after/ftplugin/ocaml_snippets.vim after/ftplugin/perl_snippets.vim after/ftplugin/php_snippets.vim after/ftplugin/phpdoc_snippets.vim after/ftplugin/propel_snippets.vim after/ftplugin/python_snippets.vim after/ftplugin/rails_snippets.vim after/ftplugin/ruby_snippets.vim after/ftplugin/sh_snippets.vim after/ftplugin/slate_snippets.vim after/ftplugin/smarty_snippets.vim after/ftplugin/symfony_snippets.vim after/ftplugin/tcl_snippets.vim after/ftplugin/template_toolkit_snippets.vim after/ftplugin/tex_snippets.vim after/ftplugin/xhtml_snippets.vim disabledby: let loaded_snippet = 1 version: 1.2.3 From jamessan at users.alioth.debian.org Sun Apr 20 14:55:36 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 14:55:36 -0000 Subject: r1255 - /trunk/packages/vim-scripts/debian/changelog Message-ID: Author: jamessan Date: Sun Apr 20 14:55:36 2008 New Revision: 1255 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1255 Log: Release 7.1.7 Modified: trunk/packages/vim-scripts/debian/changelog Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1255&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Sun Apr 20 14:55:36 2008 @@ -1,4 +1,4 @@ -vim-scripts (7.1.7) UNRELEASED; urgency=low +vim-scripts (7.1.7) unstable; urgency=low * debian/control: - Update Standards-Version to 3.7.3.0 (no changes needed). @@ -17,7 +17,7 @@ + Correct the use of inputlist() and its results so the user is able to press to cancel, as advertised. (Closes: #474599) - -- James Vega Tue, 05 Feb 2008 17:06:54 -0500 + -- James Vega Sun, 20 Apr 2008 10:55:00 -0400 vim-scripts (7.1.6) unstable; urgency=low From jamessan at users.alioth.debian.org Sun Apr 20 14:56:48 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 14:56:48 -0000 Subject: r1256 - /trunk/packages/vim-scripts/debian/control Message-ID: Author: jamessan Date: Sun Apr 20 14:56:48 2008 New Revision: 1256 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1256 Log: Correct the capitalization of Vim Modified: trunk/packages/vim-scripts/debian/control Modified: trunk/packages/vim-scripts/debian/control URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/control?rev=1256&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/control (original) +++ trunk/packages/vim-scripts/debian/control Sun Apr 20 14:56:48 2008 @@ -1,7 +1,7 @@ Source: vim-scripts Section: editors Priority: optional -Maintainer: Debian VIM Maintainers +Maintainer: Debian Vim Maintainers Uploaders: Stefano Zacchiroli , Michael Piefel , James Vega Build-Depends: cdbs, debhelper (>> 5.0.0), dpatch Build-Depends-Indep: xsltproc, docbook-xsl From jamessan at users.alioth.debian.org Sun Apr 20 15:00:00 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 15:00:00 -0000 Subject: r1257 - /trunk/packages/vim-scripts/debian/docs Message-ID: Author: jamessan Date: Sun Apr 20 15:00:00 2008 New Revision: 1257 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1257 Log: Remove CHANGES.CVSCommand.txt since that is included in the new vcscommand documentation. Modified: trunk/packages/vim-scripts/debian/docs Modified: trunk/packages/vim-scripts/debian/docs URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/docs?rev=1257&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/docs (original) +++ trunk/packages/vim-scripts/debian/docs Sun Apr 20 15:00:00 2008 @@ -1,2 +1,1 @@ html/ -CHANGES.CVSCommand.txt From jamessan at debian.org Sun Apr 20 14:54:14 2008 From: jamessan at debian.org (James Vega) Date: Sun, 20 Apr 2008 10:54:14 -0400 Subject: Bug#473744: setting package to vim-scripts, tagging 473744 Message-ID: <1208703254-2579-bts-jamessan@debian.org> # Automatically generated email from bts, devscripts version 2.10.25 # # vim-scripts (7.1.7) UNRELEASED; urgency=low # # * New addons: # - DetectIndent: Automatically detect indent settings. (Closes: #471890) # - snippetsEmu: Emulate TextMate's snippet expansion. (Closes: #473744) # package vim-scripts tags 473744 + pending From owner at bugs.debian.org Sun Apr 20 14:57:07 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sun, 20 Apr 2008 14:57:07 +0000 Subject: Processed: setting package to vim-scripts, tagging 473744 In-Reply-To: <1208703254-2579-bts-jamessan@debian.org> References: <1208703254-2579-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > # > # vim-scripts (7.1.7) UNRELEASED; urgency=low > # > # * New addons: > # - DetectIndent: Automatically detect indent settings. (Closes: #471890) > # - snippetsEmu: Emulate TextMate's snippet expansion. (Closes: #473744) > # > package vim-scripts Ignoring bugs not assigned to: vim-scripts > tags 473744 + pending Bug#473744: vim-scripts: Please ship "snippetsEmu" There were no tags set. Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From jamessan at users.alioth.debian.org Sun Apr 20 15:05:15 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 15:05:15 -0000 Subject: r1258 - /trunk/packages/vim-scripts/debian/doc-base Message-ID: Author: jamessan Date: Sun Apr 20 15:05:15 2008 New Revision: 1258 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1258 Log: Change doc-base section to Editors Modified: trunk/packages/vim-scripts/debian/doc-base Modified: trunk/packages/vim-scripts/debian/doc-base URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/doc-base?rev=1258&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/doc-base (original) +++ trunk/packages/vim-scripts/debian/doc-base Sun Apr 20 15:05:15 2008 @@ -2,7 +2,7 @@ Title: vim-scripts' scripts web pages Author: Various Abstract: Web pages of vim scripts shipped by vim-scripts -Section: Apps/Tools +Section: Editors Format: HTML Index: /usr/share/doc/vim-scripts/html/index.html From jamessan at users.alioth.debian.org Sun Apr 20 15:06:13 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 15:06:13 -0000 Subject: r1259 - /trunk/packages/vim-scripts/debian/changelog Message-ID: Author: jamessan Date: Sun Apr 20 15:06:12 2008 New Revision: 1259 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1259 Log: Update changelog and really release 7.1.7 Modified: trunk/packages/vim-scripts/debian/changelog Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1259&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Sun Apr 20 15:06:12 2008 @@ -16,6 +16,7 @@ - patches/lbdbq-inputlist.dpatch: + Correct the use of inputlist() and its results so the user is able to press to cancel, as advertised. (Closes: #474599) + * Change doc-base section to Editors. -- James Vega Sun, 20 Apr 2008 10:55:00 -0400 From jamessan at users.alioth.debian.org Sun Apr 20 15:07:33 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 15:07:33 -0000 Subject: r1260 - /tags/packages/vim-scripts/7.1.7/ Message-ID: Author: jamessan Date: Sun Apr 20 15:07:33 2008 New Revision: 1260 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1260 Log: [svn-buildpackage] Tagging vim-scripts (7.1.7) Added: tags/packages/vim-scripts/7.1.7/ - copied from r1259, trunk/packages/vim-scripts/ From jamessan at users.alioth.debian.org Sun Apr 20 15:07:55 2008 From: jamessan at users.alioth.debian.org (jamessan at users.alioth.debian.org) Date: Sun, 20 Apr 2008 15:07:55 -0000 Subject: r1261 - /trunk/packages/vim-scripts/debian/changelog Message-ID: Author: jamessan Date: Sun Apr 20 15:07:55 2008 New Revision: 1261 URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1261 Log: NOT RELEASED YET Modified: trunk/packages/vim-scripts/debian/changelog Modified: trunk/packages/vim-scripts/debian/changelog URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=1261&op=diff ============================================================================== --- trunk/packages/vim-scripts/debian/changelog (original) +++ trunk/packages/vim-scripts/debian/changelog Sun Apr 20 15:07:55 2008 @@ -1,3 +1,9 @@ +vim-scripts (7.1.8) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- James Vega Sun, 20 Apr 2008 11:07:36 -0400 + vim-scripts (7.1.7) unstable; urgency=low * debian/control: From jamessan at debian.org Sun Apr 20 15:11:37 2008 From: jamessan at debian.org (James Vega) Date: Sun, 20 Apr 2008 15:11:37 +0000 Subject: [SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-55-g1846de6 Message-ID: The following commit has been merged in the deb/runtime branch: commit 1846de6171677f00af992cd2e64be4c0c5e04756 Author: James Vega Date: Sun Apr 20 11:10:49 2008 -0400 Support highlighting of RFC3339 timestamps. Closes #475568 Signed-off-by: James Vega diff --git a/runtime/syntax/messages.vim b/runtime/syntax/messages.vim index 2dbaa5a..f1c05c6 100644 --- a/runtime/syntax/messages.vim +++ b/runtime/syntax/messages.vim @@ -10,7 +10,7 @@ endif let s:cpo_save = &cpo set cpo&vim -syn match messagesBegin display '^' nextgroup=messagesDate +syn match messagesBegin display '^' nextgroup=messagesDate,messagesDateRFC3339 syn match messagesDate contained display '\a\a\a [ 0-9]\d *' \ nextgroup=messagesHour @@ -18,6 +18,15 @@ syn match messagesDate contained display '\a\a\a [ 0-9]\d *' syn match messagesHour contained display '\d\d:\d\d:\d\d\s*' \ nextgroup=messagesHost +syn match messagesDateRFC3339 contained display '\d\{4}-\d\d-\d\d' + \ nextgroup=messagesRFC3339T + +syn match messagesRFC3339T contained display '\cT' + \ nextgroup=messagesHourRFC3339 + +syn match messagesHourRFC3339 contained display '\c\d\d:\d\d:\d\d\(\.\d\+\)\=\([+-]\d\d:\d\d\|Z\)' + \ nextgroup=messagesHost + syn match messagesHost contained display '\S*\s*' \ nextgroup=messagesLabel @@ -43,6 +52,9 @@ syn match messagesError contained '\c.*\<\(FATAL\|ERROR\|ERRORS\|FAILED\ hi def link messagesDate Constant hi def link messagesHour Type +hi def link messagesDateRFC3339 Constant +hi def link messagesHourRFC3339 Type +hi def link messagesRFC3339T Normal hi def link messagesHost Identifier hi def link messagesLabel Operator hi def link messagesPID Constant -- Vim packaging From owner at bugs.debian.org Sun Apr 20 15:15:09 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sun, 20 Apr 2008 15:15:09 +0000 Subject: Processed: tagging 475568 In-Reply-To: <1208704358-2455-bts-jamessan@debian.org> References: <1208704358-2455-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.25 > tags 475568 pending Bug#475568: [vim-runtime] Recognize RFC 3339 high-precision timestamps There were no tags set. Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From owner at bugs.debian.org Sun Apr 20 15:33:20 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sun, 20 Apr 2008 15:33:20 +0000 Subject: Bug#471890: marked as done (vim-scripts: please include DetectIndent script on the package) References: <20080320215936.GA4256@softwarelivre.org> Message-ID: Your message dated Sun, 20 Apr 2008 15:17:08 +0000 with message-id and subject line Bug#471890: fixed in vim-scripts 7.1.7 has caused the Debian Bug report #471890, regarding vim-scripts: please include DetectIndent script on the package to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 471890: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471890 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Antonio Terceiro Subject: vim-scripts: please include DetectIndent script on the package Date: Thu, 20 Mar 2008 18:59:36 -0300 Size: 3246 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/bde520ee/attachment-0002.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#471890: fixed in vim-scripts 7.1.7 Date: Sun, 20 Apr 2008 15:17:08 +0000 Size: 4635 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/bde520ee/attachment-0003.eml From owner at bugs.debian.org Sun Apr 20 15:33:24 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sun, 20 Apr 2008 15:33:24 +0000 Subject: Bug#474599: marked as done (lbdbq: does not cancel a query) References: <20080406172450.14544.20713.reportbug@clamp.lan> Message-ID: Your message dated Sun, 20 Apr 2008 15:17:08 +0000 with message-id and subject line Bug#474599: fixed in vim-scripts 7.1.7 has caused the Debian Bug report #474599, regarding lbdbq: does not cancel a query to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 474599: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=474599 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Filippo Giunchedi Subject: lbdbq: does not cancel a query Date: Sun, 06 Apr 2008 19:24:50 +0200 Size: 2458 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/787aee88/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#474599: fixed in vim-scripts 7.1.7 Date: Sun, 20 Apr 2008 15:17:08 +0000 Size: 4635 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/787aee88/attachment-0001.eml From owner at bugs.debian.org Sun Apr 20 15:33:22 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sun, 20 Apr 2008 15:33:22 +0000 Subject: Bug#473744: marked as done (vim-scripts: Please ship "snippetsEmu") References: <20080401115607.10081.94914.reportbug@castor.fargas.local> Message-ID: Your message dated Sun, 20 Apr 2008 15:17:08 +0000 with message-id and subject line Bug#473744: fixed in vim-scripts 7.1.7 has caused the Debian Bug report #473744, regarding vim-scripts: Please ship "snippetsEmu" to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 473744: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473744 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Marc Fargas Subject: vim-scripts: Please ship "snippetsEmu" Date: Tue, 01 Apr 2008 13:56:07 +0200 Size: 2625 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/35a6e118/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#473744: fixed in vim-scripts 7.1.7 Date: Sun, 20 Apr 2008 15:17:08 +0000 Size: 4635 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/35a6e118/attachment-0001.eml From owner at bugs.debian.org Sun Apr 20 15:33:19 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sun, 20 Apr 2008 15:33:19 +0000 Subject: Bug#465330: marked as done (vim-scripts: xml.vim only works for first buffer with ft=xml) References: <20080211210149.18630.54054.reportbug@flik.wdw> Message-ID: Your message dated Sun, 20 Apr 2008 15:17:08 +0000 with message-id and subject line Bug#465330: fixed in vim-scripts 7.1.7 has caused the Debian Bug report #465330, regarding vim-scripts: xml.vim only works for first buffer with ft=xml to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 465330: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=465330 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Marvin Renich Subject: vim-scripts: xml.vim only works for first buffer with ft=xml Date: Mon, 11 Feb 2008 16:01:49 -0500 Size: 3027 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/0cab768b/attachment-0002.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#465330: fixed in vim-scripts 7.1.7 Date: Sun, 20 Apr 2008 15:17:08 +0000 Size: 4635 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/0cab768b/attachment-0003.eml From owner at bugs.debian.org Sun Apr 20 15:50:10 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sun, 20 Apr 2008 15:50:10 +0000 Subject: Bug#244592: marked as done ([vim-runtime] bug using macros/less.sh) References: <20080420154301.GA8543@jamessan.com> <20040419022933.GA18254@grantbow.com> Message-ID: Your message dated Sun, 20 Apr 2008 11:43:01 -0400 with message-id <20080420154301.GA8543 at jamessan.com> and subject line Re: Bug#244592: vim: bug using macros/less.sh has caused the Debian Bug report #244592, regarding [vim-runtime] bug using macros/less.sh to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 244592: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=244592 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Grant Bowman Subject: vim: bug using macros/less.sh Date: Sun, 18 Apr 2004 19:29:33 -0700 Size: 2457 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/cb60a6fc/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Re: Bug#244592: vim: bug using macros/less.sh Date: Sun, 20 Apr 2008 11:43:01 -0400 Size: 3190 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080420/cb60a6fc/attachment-0001.eml From dwslxc3y at mail.ru Sun Apr 20 21:08:06 2008 From: dwslxc3y at mail.ru (éÝÅÍ ÷ÁÛÉÈ ÐÏËÕÐÁÔÅÌÅÊ) Date: Mon, 21 Apr 2008 01:08:06 +0400 Subject: In-Reply-To: <1208725685.3393198162@mx37.mail.ru> References: <1208725685.3393198162@mx37.mail.ru> Message-ID: ??????? ??? ??? ?? ???????? ???? ?????? ????????????? ???????? ??? ?????? ??????? ????????, ?????, ???????, e-mail, ????, ??? ???????????? ???????? ?????, ??????, ???????? ?? ??? ???????????: ???????? ????? ???????????? ????? ????????????? ???????? ? ???????? ?????? ?? ???????????? ? ??? ?????? ????? ? ??? ????????? ? ???? ?????????? ???? ?????? ? ??????. ????????? ??????? ?? ????????: +79133913837 ICQ: 62-888-62 Email: rassilka.agent at gmail.com ------------------------------------ Mail.Ru - ??????, ????????, ???????! ------------------------------------ From jamessan at debian.org Mon Apr 21 11:48:33 2008 From: jamessan at debian.org (James Vega) Date: Mon, 21 Apr 2008 11:48:33 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-85-g00407d2 Message-ID: The following commit has been merged in the debian branch: commit 00407d2cea24fc1bfde7fa8d5df16303e7c3de13 Author: James Vega Date: Mon Apr 21 07:47:40 2008 -0400 Correct the vim-common and vim-runtime descriptions. Signed-off-by: James Vega diff --git a/debian/control b/debian/control index 2b7c45e..e3858d9 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Description: Vi IMproved - Common files This package contains files shared by all non GUI-enabled vim variants (vim and vim-tiny currently) available in Debian. Examples of such shared files are: manpages, common executables - like vimtutor and xxd, and configuration files. + like xxd, and configuration files. Package: vim-gui-common Priority: optional @@ -58,11 +58,11 @@ Description: Vi IMproved - Runtime files highlighting, command line history, on-line help, filename completion, block operations, folding, Unicode support, etc. . - This package contains the architecture independent runtime - files, used, if available, by all vim variants available in - Debian. Example of such runtime files are: online documentation, - rules for language-specific syntax highlighting and indentation, - color schemes, and standard plugins. + This package contains vimtutor and the architecture independent runtime + files, used, if available, by all vim variants available in Debian. + Example of such runtime files are: online documentation, rules for + language-specific syntax highlighting and indentation, color schemes, + and standard plugins. Package: vim-doc Section: doc -- Vim packaging From patrick at upcomingeventslist.com Mon Apr 21 17:41:33 2008 From: patrick at upcomingeventslist.com (Patrick) Date: Mon, 21 Apr 2008 11:41:33 -0600 Subject: Toronto - Canadian Marketing Bootcamps - NO Charge Message-ID: <200804211741.m3LHfXiL004342@winmail-3.blueweb.co.kr> This is a text part of the message. It is shown for the users of old-style e-mail clients -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080421/6642fdae/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: image/jpeg Size: 5578 bytes Desc: not available Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080421/6642fdae/attachment-0001.jpeg From bugreports at nn7.de Tue Apr 22 13:29:07 2008 From: bugreports at nn7.de (Soeren Sonnenburg) Date: Tue, 22 Apr 2008 15:29:07 +0200 Subject: Bug#477328: please package international spell files Message-ID: <20080422132907.32280.44543.reportbug@localhost> Package: vim Version: 1:7.1.293-1 Severity: wishlist vim's spell feature won't work in native languages if one does not have the right language files, eg. set spelllang=de won't work if the de.utf* files from http://ftp.vim.org/vim/runtime/spell/ are installed in /usr/share/vim/vim71/spell/ - so it would be nice to have them installed as a package e.g. vim-spell-de -- System Information: Debian Release: lenny/sid APT prefers stable APT policy: (700, 'stable'), (650, 'testing'), (600, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.25-sonne (SMP w/2 CPU cores; PREEMPT) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages vim depends on: ii libacl1 2.2.45-1 Access control list shared library ii libc6 2.7-10 GNU C Library: Shared libraries ii libgpmg1 1.20.3~pre3-3 General Purpose Mouse - shared lib ii libncurses5 5.6+20080419-1 Shared libraries for terminal hand ii libselinux1 2.0.59-1 SELinux shared libraries ii vim-common 1:7.1.293-1 Vi IMproved - Common files ii vim-runtime 1:7.1.293-1 Vi IMproved - Runtime files vim recommends no packages. -- no debconf information From owner at bugs.debian.org Tue Apr 22 14:09:03 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Tue, 22 Apr 2008 14:09:03 +0000 Subject: Bug#477328: marked as done (please package international spell files) References: <20080422140231.GA23248@jamessan.com> <20080422132907.32280.44543.reportbug@localhost> Message-ID: Your message dated Tue, 22 Apr 2008 10:02:31 -0400 with message-id <20080422140231.GA23248 at jamessan.com> and subject line Re: Bug#477328: please package international spell files has caused the Debian Bug report #477328, regarding please package international spell files to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 477328: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477328 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Soeren Sonnenburg Subject: please package international spell files Date: Tue, 22 Apr 2008 15:29:07 +0200 Size: 2725 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080422/0731a833/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Re: Bug#477328: please package international spell files Date: Tue, 22 Apr 2008 10:02:31 -0400 Size: 3463 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080422/0731a833/attachment-0001.eml From stefanfries0 at googlemail.com Tue Apr 22 15:14:40 2008 From: stefanfries0 at googlemail.com (Stefan Fries) Date: Tue, 22 Apr 2008 17:14:40 +0200 (CEST) Subject: =?ISO-8859-1?Q?Stefan_Fries_l=E4dt_Sie_auf_Viadeo_ein?= Message-ID: <11458985.1208877280579.JavaMail.viaduc@daemon> ============================================================ Stefan Fries l?dt Sie auf Viadeo ein Hallo, ich bin derzeit Mitglied bei Viadeo.com, einem Online-Forum, das Personen ?ber Business Networking miteinander verbindet. Ich w?rde mich ?ber eine Kontaktaufnahme sehr freuen. Mit herzlichen Gr??en, Stefan FriesDie kostenlose Registrierung dauert nur einige Minuten!Ich akzeptiere die Einladung von Stefan Fries http://www.viadeo.com/action/index.jsp?actionId=0021p4721csgmt35&urlId=0021v1e4bjtkdcp0 PS: Viadeo nimmt all seinen Sinn wenn Sie selbst Ihre Kontakte einladen.Viadeo.com - Ein unentbehrliches Tool, um Ihre Karriere und Ihr Gesch?ft zu entwickeln: Identifizieren Sie die Entscheidungstr?ger in Tausende von Unternehmen Finden Sie neue Gesch?ftsangelegenheiten F?rdern Sie Ihre Karriere Klicken Sie hier um sich zu registrieren http://www.viadeo.com/action/index.jsp?actionId=0021p4721csgmt35&urlId=0021v1e4bjtkdcp0 Viadeo.com das durch mehr als 2.000.000 Profis gew?hlte soziale Netzwerk 3.000 gesponserte Mitglieder pro Tag.Wenn die Links dieser Email unsichtbar sind, kopieren Sie bitte die untenstehende Adresse um die Einladung von Stefan Fries anzunehmen: http://www.viadeo.com/action/index.jsp?actionId=0021p4721csgmt35&urlId=0021v1e4bjtkdcp0 http://www.viadeo.com/action/index.jsp?actionId=0021p4721csgmt35&urlId=0021v1e4bjtkdcp0 ============================================================ -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080422/54579de5/attachment.htm From debian-bugs at thequod.de Tue Apr 22 18:49:34 2008 From: debian-bugs at thequod.de (Daniel Hahler) Date: Tue, 22 Apr 2008 20:49:34 +0200 Subject: Bug#477379: vimrc.tiny contains unsubstituted @VIMCUR@ macro (runtimepath) Message-ID: <20080422184934.15970.42038.reportbug@base.local> Package: vim Version: 1:7.1.293-1 Severity: normal Tags: patch In /etc/vim/vimrc.tiny there is an unsubstituted reference to @VIMCUR@, because debian/tiny/vimrc.tiny gets not handled like the other .in-files: set runtimepath=~/.vim,[...],/usr/share/vim/@VIMCUR@,[...],~/.vim/after >From a quick look at debian/rules in the source package, it seems like ./debian/tiny/vimrc.tiny should get shipped as ./debian/tiny/vimrc.tiny.in and handled similar to the other files defined in DOT_IN_DEPS, so that it gets processed by the following block: %: %.in cat $< | sed 's/@VIMCUR@/$(VIMCUR)/' > $@ I'm attaching a patch, which fixes this in Ubuntu, but it does not apply to the more recent version in unstable. However, I don't think it's the best approach anyway, because I've hooked it into the build-stamp-vim-tiny target, while DOT_IN_DEPS gets handled by the install target for vim-basic. -------------- next part -------------- reverted: --- vim-7.1/debian/tiny/vimrc.tiny +++ vim-7.1.orig/debian/tiny/vimrc.tiny @@ -1,13 +0,0 @@ -" Vim configuration file, in effect when invoked as "vi". The aim of this -" configuration file is to provide a Vim environment as compatible with the -" original vi as possible. Note that ~/.vimrc configuration files as other -" configuration files in the runtimepath are still sourced. -" When Vim is invoked differently ("vim", "view", "evim", ...) this file is -" _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are. - -" Debian system-wide default configuration Vim -set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/@VIMCUR@,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after - -set compatible - -" vim: set ft=vim: diff -u vim-7.1/debian/changelog vim-7.1/debian/changelog --- vim-7.1/debian/changelog +++ vim-7.1/debian/changelog @@ -1,3 +1,10 @@ +vim (1:7.1-138+1ubuntu4) hardy; urgency=low + + * Move debian/tiny/vimrc.tiny to vimrc.tiny.in, so that @VIMCUR@ gets + substituted (LP: #220561) + + -- Daniel Hahler Tue, 22 Apr 2008 12:40:05 +0200 + vim (1:7.1-138+1ubuntu3) hardy; urgency=low * patches/debchangelog_launchpad.diff: diff -u vim-7.1/debian/rules vim-7.1/debian/rules --- vim-7.1/debian/rules +++ vim-7.1/debian/rules @@ -140,6 +140,7 @@ DOT_IN_DEPS += debian/vim-gui-common.links DOT_IN_DEPS += debian/vim-runtime.links DOT_IN_DEPS += debian/runtime/debian.vim +DOT_IN_DEPS_TINY = debian/tiny/vimrc.tiny # nothing to do per default all: @@ -200,6 +201,7 @@ patch -Rp0 < debian/tiny/vimrc.tiny.diff; \ rm -f patch-stamp-vimrc-tiny; \ fi + rm -f $(DOT_IN_DEPS_TINY) clean-%: for x in $(PER_VARIANT_FILES) ; do \ @@ -241,6 +243,7 @@ touch $@ build-stamp-vim-tiny: CURCFLAGS=$(CFLAGS_vim-tiny) +build-stamp-vim-tiny: $(DOT_IN_DEPS_TINY) build-stamp-vim-tiny: configure-stamp-vim-tiny dh_testdir @echo "*** DEBIAN *** BUILDING VARIANT vim-tiny" only in patch2: unchanged: --- vim-7.1.orig/debian/tiny/vimrc.tiny.in +++ vim-7.1/debian/tiny/vimrc.tiny.in @@ -0,0 +1,13 @@ +" Vim configuration file, in effect when invoked as "vi". The aim of this +" configuration file is to provide a Vim environment as compatible with the +" original vi as possible. Note that ~/.vimrc configuration files as other +" configuration files in the runtimepath are still sourced. +" When Vim is invoked differently ("vim", "view", "evim", ...) this file is +" _not_ sourced; /etc/vim/vimrc and/or /etc/vim/gvimrc are. + +" Debian system-wide default configuration Vim +set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/@VIMCUR@,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after + +set compatible + +" vim: set ft=vim: From jamessan at debian.org Tue Apr 22 19:46:03 2008 From: jamessan at debian.org (James Vega) Date: Tue, 22 Apr 2008 19:46:03 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-86-g92052e8 Message-ID: The following commit has been merged in the debian branch: commit 92052e8307e145a4d75c4c8ad6cdcf5e59151de1 Author: James Vega Date: Tue Apr 22 15:38:39 2008 -0400 Fix expansion of @VIMCUR@ in vimrc.tiny. Rename vimrc.tiny to vimrc.tiny.in and set DOT_IN_DEPS_TINY to debian/tiny/vimrc.tiny.in. Add conditional cleanup of DOT_IN_DEPS_TINY in the clean-% target and conditional prerequisite of DOT_IN_DEPS_TINY in the install-stamp-% target. Based off a patch by Daniel Hahler. Closes #477379 Signed-off-by: James Vega diff --git a/debian/rules b/debian/rules index 300122f..be85d1b 100755 --- a/debian/rules +++ b/debian/rules @@ -135,6 +135,7 @@ DOT_IN_DEPS += debian/vim-common.links DOT_IN_DEPS += debian/vim-gui-common.links DOT_IN_DEPS += debian/vim-runtime.links DOT_IN_DEPS += debian/runtime/debian.vim +DOT_IN_DEPS_TINY := debian/tiny/vimrc.tiny # nothing to do per default all: @@ -196,6 +197,9 @@ clean-%: done rm -f debian/lintian/$* rm -f src/$(subst -,.,$*) + if [ "$*" = "vim-tiny" ]; then \ + rm -f $(DOT_IN_DEPS_TINY); \ + fi build: build-stamp build-stamp: $(foreach v,$(VARIANTS),build-stamp-$(v)) @@ -361,7 +365,7 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS) # the other variants only include the binary install-stamp-%: export DH_OPTIONS=-p$* install-stamp-%: DESTDIR=$(CURDIR)/debian/$* -install-stamp-%: build-stamp-% +install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),) dh_testdir dh_testroot @echo "*** DEBIAN *** INSTALLING VARIANT $*" diff --git a/debian/tiny/vimrc.tiny b/debian/tiny/vimrc.tiny.in similarity index 100% rename from debian/tiny/vimrc.tiny rename to debian/tiny/vimrc.tiny.in -- Vim packaging From owner at bugs.debian.org Tue Apr 22 20:00:03 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Tue, 22 Apr 2008 20:00:03 +0000 Subject: Processed: tagging 477379 In-Reply-To: <1208893679-1746-bts-jamessan@debian.org> References: <1208893679-1746-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.26 > tags 477379 pending Bug#477379: vimrc.tiny contains unsubstituted @VIMCUR@ macro (runtimepath) Tags were: patch Tags added: pending > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From owner at bugs.debian.org Tue Apr 22 21:51:21 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Tue, 22 Apr 2008 21:51:21 +0000 Subject: Processed: closing 464393 In-Reply-To: <1208900326-659-bts-jamessan@debian.org> References: <1208900326-659-bts-jamessan@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > # Automatically generated email from bts, devscripts version 2.10.26 > close 464393 Bug#464393: [vim-tiny] help files are not installed in correct directory 'close' is deprecated; see http://www.debian.org/Bugs/Developer#closing. Bug closed, send any further explanations to "Dan H." > End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) From mrvn at renich.org Tue Apr 22 22:36:08 2008 From: mrvn at renich.org (Marvin Renich) Date: Tue, 22 Apr 2008 18:36:08 -0400 Subject: RFC: Gatekeeper - control which plugins are loaded In-Reply-To: <20080422004921.97636a0b.mb@kotka.de> References: <20080422004921.97636a0b.mb@kotka.de> Message-ID: <20080422223608.GA12738@flik.wdw> * Meikel Brandmeyer [080421 17:46]: > Hello Vim developers, > > some days ago, there was a short discussion on #vim, that one cannot > easily prevent plugins from loading. A distribution could install some > scripts/plugins in the system-wide vimfiles directory, but the user > could not defend against such a "pollution". Each plugin uses a > different guard, so it's tedious to find out which one keeps a script > from loading. > > I thought a bit about this problem and came up with the following > solution: Gatekeeper. Gatekeeper keeps track of which plugins the user > wants to load, which plugins the users dislikes and which he doesn't > care about. So it is easy to disable specific plugins. > [snip] > From the script's perspective using gatekeeper is quite simple. It is a > single function call, which is used in the plugin guard header, which > prevents the script from being sourced multiple times. In fact, > gatekeeper even simplifies this header, since the normally used guard > variable is hidden away. > [snip] > So I'd like to drop this on the list with a request for comments. Any > comments on the idea are appreciated. > > Sincerely > Meikel > Actually, I like Debian's approach (thanks Debian Vim Maintainers and especially Stefano Zacchiroli). Rather than force every plugin to use a common interface to allow enabling/disabling individual plugins in a distribution, they built a vim-addon-manager package that allows the sysadmin to determine which plugins are enabled by default, and allows individual users to enable/disable each plugin separately, overriding the sysadmin's defaults. The global defaults are done by placing the scripts in a directory that is not in Vim's rtp, and then using symlinks to the system-wide enabled ones in a directory that is in rtp. Individual user preferences are likewise symlinks in the user's .vim/ directory structure. The only tricky part is disabling a default-enabled system-wide script. This is done by the Vim maintainers by manually determining for each script what to put in ~/.vim/plugin/000-vim-addons.vim to tell the script not to load (or make it think it is already loaded). More kudos to the Debian Vim Maintainers: Some people are really concerned about having the absolute latest patches to Vim and compile Vim themselves to that end. The Debian maintainers are very responsive, and while you cannot always get the latest patches in a binary Debian package, you can usually get very close. Currently, you can get official Debian packages with Vim 7.1-293, which is, indeed, the most up-to-date version. ...Marvin From zack at debian.org Wed Apr 23 01:38:16 2008 From: zack at debian.org (Stefano Zacchiroli) Date: Wed, 23 Apr 2008 09:38:16 +0800 Subject: RFC: Gatekeeper - control which plugins are loaded In-Reply-To: <20080422223608.GA12738@flik.wdw> References: <20080422004921.97636a0b.mb@kotka.de> <20080422223608.GA12738@flik.wdw> Message-ID: <20080423013816.GB10239@aquarium.takhisis.invalid> On Tue, Apr 22, 2008 at 06:36:08PM -0400, Marvin Renich wrote: > Actually, I like Debian's approach (thanks Debian Vim Maintainers and > especially Stefano Zacchiroli). Rather than force every plugin to use a Marvin, thanks both for the kudos and for forwarding to us this thread handle. I'm no longer following actively vim-dev these days, but I believe James Vega (the most active vim maintainers in Debian these days, and which deserves the kudos part on our responsiveness :)) does. My thought on this issue is as follows. I don't like reinventing wheels, and it is what possibly happened with Gatekeeper. I hope your message can help fixing this. We would be very happy Debian-side if our vim-addon-manager solution will spread outside Debian boundaries, it is by no means Debian-specific. Our policies for how to handle this are stored in the Debian Vim policy (http://pkg-vim.alioth.debian.org/vim-policy.html/) and can be read be whoever wants. Similarly, the vim-addons source code is available and free software. The implementation is probably suboptimal, but it is not a complicated piece of code, if there is interest in the wider vim-dev community we might even rewrite it from scratch! implementing perceived needs. Just let us know. Please remember to Cc pkg-vim-maintainers at lists.alioth.debian.org if you want to be sure that me, or someone else of the Debian vim maintainers, follows this thread. Cheers. -- Stefano Zacchiroli -*- PhD in Computer Science ............... now what? zack@{upsilon.cc,cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ? /\ All one has to do is hit the (15:57:15) Bac: no, la demo scema \/ right keys at the right time -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: Digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/277f221d/attachment.pgp From jamessan at debian.org Wed Apr 23 15:48:37 2008 From: jamessan at debian.org (James Vega) Date: Wed, 23 Apr 2008 15:48:37 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-87-gce71e28 Message-ID: The following commit has been merged in the debian branch: commit ce71e28a2c7eaaabd2f55983436ab2512b9fc87b Author: James Vega Date: Wed Apr 23 11:29:01 2008 -0400 Move vimrc.tiny from vim-common to vim-tiny. Shipping vimrc.tiny in vim-common doesn't make much sense since it's only used by vim-tiny. Update debian/rules to put the proper .install/.links lines in for vim-tiny. Add Conflicts/Replaces to vim-tiny against vim-common in order to move the config file from vim-common to vim-tiny. Signed-off-by: James Vega diff --git a/debian/control b/debian/control index e3858d9..691fe28 100644 --- a/debian/control +++ b/debian/control @@ -81,7 +81,8 @@ Description: Vi IMproved - HTML documentation Package: vim-tiny Priority: important Architecture: any -Conflicts: vim-runtime (<< 1:7.1-056+1) +Conflicts: vim-runtime (<< 1:7.1-056+1), vim-common (<< 1:7.1.293-2) +Replaces: vim-common (<< 1:7.1.293-2) Depends: vim-common (= ${binary:Version}), ${shlibs:Depends} Provides: editor Description: Vi IMproved - enhanced vi editor - compact version diff --git a/debian/rules b/debian/rules index be85d1b..69039e1 100755 --- a/debian/rules +++ b/debian/rules @@ -399,6 +399,8 @@ install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),) # fake help installation for vim-tiny if [ "$*" = "vim-tiny" ]; then \ echo "debian/tiny/doc/ usr/share/vim/$(VIMCUR)" >> debian/$*.install; \ + echo "debian/tiny/vimrc.tiny etc/vim" >> debian/$*.install; \ + echo "etc/vim/vimrc.tiny usr/share/vim/vimrc.tiny" >> debian/$*.links; \ fi dh_install dh_installmenu diff --git a/debian/vim-common.install.in b/debian/vim-common.install.in index 0f318af..ac7c0a6 100644 --- a/debian/vim-common.install.in +++ b/debian/vim-common.install.in @@ -1,6 +1,5 @@ debian/tmp/usr/bin/xxd usr/bin/ debian/helpztags usr/bin/ debian/runtime/vimrc etc/vim/ -debian/tiny/vimrc.tiny etc/vim/ debian/runtime/debian.vim usr/share/vim/@VIMCUR@/ debian/tmp/usr/share/man/man1/* usr/share/man/man1/ diff --git a/debian/vim-common.links.in b/debian/vim-common.links.in index 130881b..df55cd9 100644 --- a/debian/vim-common.links.in +++ b/debian/vim-common.links.in @@ -1,6 +1,5 @@ etc/vim usr/share/vim/vimfiles etc/vim/vimrc usr/share/vim/vimrc -etc/vim/vimrc.tiny usr/share/vim/vimrc.tiny usr/share/vim/@VIMCUR@ usr/share/vim/vimcurrent usr/share/man/man1/vim.1 usr/share/man/man1/rvim.1 -- Vim packaging From jamessan at debian.org Wed Apr 23 17:45:03 2008 From: jamessan at debian.org (James Vega) Date: Wed, 23 Apr 2008 17:45:03 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-88-gf454e67 Message-ID: The following commit has been merged in the debian branch: commit f454e67251be2efda8e7e0db0e881c7173bde80d Author: James Vega Date: Wed Apr 23 13:43:31 2008 -0400 Separate out the install-stamp-vim-tiny target. Apparently my make fu isn't strong enough. Trying to make a prerequisite that is only enabled when the wildcard target matches a certain value didn't work right. Simplify things by giving vim-tiny its own install-stamp target. Signed-off-by: James Vega diff --git a/debian/rules b/debian/rules index 69039e1..f547747 100755 --- a/debian/rules +++ b/debian/rules @@ -363,9 +363,47 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS) touch $@ # the other variants only include the binary +install-stamp-vim-tiny: export DH_OPTIONS=-pvim-tiny +install-stamp-vim-tiny: DESTDIR=$(CURDIR)/debian/vim-tiny +install-stamp-vim-tiny: build-stamp-vim-tiny $(DOT_IN_DEPS_TINY) + dh_testdir + dh_testroot + @echo "*** DEBIAN *** INSTALLING VARIANT vim-tiny" + dh_clean -k + dh_installdirs + + # variant-related installations + # to be kept in sync with those in "install-stamp-vim-basic" target + for x in $(PER_VARIANT_FILES) ; do \ + sed -e "s:@PKG@:vim-tiny:" -e "s:@VARIANT@:tiny:" \ + -e "s:@COMMON@:vim-common:" \ + debian/vim-variant.$$x > debian/vim-tiny.$$x ;\ + done + sed -e "s:@PKG@:vim-tiny:;s:@VARIANT@:tiny:" \ + debian/lintian/vim-variant > debian/lintian/vim-tiny + # Handle the gvim menu file overrides + if [ -e "debian/lintian/vim-tiny.in" ]; then \ + cat debian/lintian/vim-tiny.in >> debian/lintian/vim-tiny; \ + fi + for L in $(LANGS); do \ + sed -e "s:\(.*\)@LANG_ALTS@:\1--slave \$$mandir/$$L/man1/\$$i.1.gz \$$i.$$L.1.gz \$$mandir/$$L/man1/vim.1.gz \\\\\n&:" \ + -i debian/vim-tiny.postinst; \ + done + sed -i "/@LANG_ALTS@/d" debian/vim-tiny.postinst + # fake help installation for vim-tiny + echo "debian/tiny/doc/ usr/share/vim/$(VIMCUR)" >> debian/vim-tiny.install; \ + echo "debian/tiny/vimrc.tiny etc/vim" >> debian/vim-tiny.install; \ + echo "etc/vim/vimrc.tiny usr/share/vim/vimrc.tiny" >> debian/vim-tiny.links; \ + dh_install + dh_installmenu + dh_link + + touch $@ + +# the other variants only include the binary install-stamp-%: export DH_OPTIONS=-p$* install-stamp-%: DESTDIR=$(CURDIR)/debian/$* -install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),) +install-stamp-%: build-stamp-% dh_testdir dh_testroot @echo "*** DEBIAN *** INSTALLING VARIANT $*" @@ -375,7 +413,7 @@ install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),) # variant-related installations # to be kept in sync with those in "install-stamp-vim-basic" target for x in $(PER_VARIANT_FILES) ; do \ - if [ "$*" = "vim-tiny" -o "$*" = "vim-nox" ]; then \ + if [ "$*" = "vim-nox" ]; then \ sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \ -e "s:@COMMON@:vim-common:" \ debian/vim-variant.$$x > debian/$*.$$x ;\ @@ -396,12 +434,6 @@ install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),) -i debian/$*.postinst; \ done sed -i "/@LANG_ALTS@/d" debian/$*.postinst - # fake help installation for vim-tiny - if [ "$*" = "vim-tiny" ]; then \ - echo "debian/tiny/doc/ usr/share/vim/$(VIMCUR)" >> debian/$*.install; \ - echo "debian/tiny/vimrc.tiny etc/vim" >> debian/$*.install; \ - echo "etc/vim/vimrc.tiny usr/share/vim/vimrc.tiny" >> debian/$*.links; \ - fi dh_install dh_installmenu dh_link -- Vim packaging From jamessan at debian.org Wed Apr 23 17:51:05 2008 From: jamessan at debian.org (James Vega) Date: Wed, 23 Apr 2008 17:51:05 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-89-g533dd84 Message-ID: The following commit has been merged in the debian branch: commit 533dd84c2565591b45fcb83d51bbae28180abb08 Author: James Vega Date: Wed Apr 23 13:50:23 2008 -0400 Remove some unneeded line continuations. Signed-off-by: James Vega diff --git a/debian/rules b/debian/rules index f547747..3e47720 100755 --- a/debian/rules +++ b/debian/rules @@ -391,9 +391,9 @@ install-stamp-vim-tiny: build-stamp-vim-tiny $(DOT_IN_DEPS_TINY) done sed -i "/@LANG_ALTS@/d" debian/vim-tiny.postinst # fake help installation for vim-tiny - echo "debian/tiny/doc/ usr/share/vim/$(VIMCUR)" >> debian/vim-tiny.install; \ - echo "debian/tiny/vimrc.tiny etc/vim" >> debian/vim-tiny.install; \ - echo "etc/vim/vimrc.tiny usr/share/vim/vimrc.tiny" >> debian/vim-tiny.links; \ + echo "debian/tiny/doc/ usr/share/vim/$(VIMCUR)" >> debian/vim-tiny.install + echo "debian/tiny/vimrc.tiny etc/vim" >> debian/vim-tiny.install + echo "etc/vim/vimrc.tiny usr/share/vim/vimrc.tiny" >> debian/vim-tiny.links dh_install dh_installmenu dh_link -- Vim packaging From dak at ftp-master.debian.org Wed Apr 23 18:58:02 2008 From: dak at ftp-master.debian.org (Archive Administrator) Date: Wed, 23 Apr 2008 18:58:02 +0000 Subject: Processing of vim_7.1.293-2_i386.changes Message-ID: vim_7.1.293-2_i386.changes uploaded successfully to localhost along with the files: vim_7.1.293-2.dsc vim_7.1.293-2.diff.gz vim-gui-common_7.1.293-2_all.deb vim-runtime_7.1.293-2_all.deb vim-doc_7.1.293-2_all.deb vim-perl_7.1.293-2_all.deb vim-python_7.1.293-2_all.deb vim-ruby_7.1.293-2_all.deb vim-tcl_7.1.293-2_all.deb vim-full_7.1.293-2_all.deb vim-tiny_7.1.293-2_i386.deb vim-gtk_7.1.293-2_i386.deb vim-gnome_7.1.293-2_i386.deb vim-lesstif_7.1.293-2_i386.deb vim-nox_7.1.293-2_i386.deb vim-common_7.1.293-2_i386.deb vim_7.1.293-2_i386.deb vim-dbg_7.1.293-2_i386.deb Greetings, Your Debian queue daemon From jamessan at debian.org Wed Apr 23 19:00:46 2008 From: jamessan at debian.org (James Vega) Date: Wed, 23 Apr 2008 19:00:46 +0000 Subject: [SCM] Vim packaging branch, master, updated. debian/7.1.293-1-40-g519b82d Message-ID: The following commit has been merged in the master branch: commit 319bd7ab6d5aea3a0976d15d35a1d3619c0a145f Merge: 08a0765143b4eadfe9e615c537b4d1eafa49d22d 533dd84c2565591b45fcb83d51bbae28180abb08 1846de6171677f00af992cd2e64be4c0c5e04756 Author: James Vega Date: Wed Apr 23 13:51:27 2008 -0400 Merge branches 'debian' and 'deb/runtime' Conflicts: runtime/filetype.vim runtime/scripts.vim Signed-off-by: James Vega -- Vim packaging From jamessan at debian.org Wed Apr 23 19:00:47 2008 From: jamessan at debian.org (James Vega) Date: Wed, 23 Apr 2008 19:00:47 +0000 Subject: [SCM] Vim packaging branch, master, updated. debian/7.1.293-1-40-g519b82d Message-ID: The following commit has been merged in the master branch: commit 519b82d3f78f117fa6ae71d7ee9c8ac975c3cb5b Author: James Vega Date: Wed Apr 23 13:52:04 2008 -0400 Release 7.1.293-2 Signed-off-by: James Vega diff --git a/debian/changelog b/debian/changelog index efa0f54..a50becf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +vim (1:7.1.293-2) unstable; urgency=low + + * debian/rules: + - Fix expansion of @VIMCUR@ in vimrc.tiny. Based off a patch by Daniel + Hahler. (Closes: #477379) + - Create a separate install-stamp-vim-tiny target. + - Add the proper lines for vimrc.tiny to vim-tiny.{install,links} in the + install-stamp-vim-tiny target. + * debian/control: + - Correct the vim-common and vim-runtime descriptions with regard to + vimtutor. + - Add Conflicts/Replaces to vim-tiny against vim-common since + /etc/vim/vimrc.tiny is moving to the vim-tiny package. + * runtime/syntax/messages.vim: + - Support highlighting of RFC3339 timestamps. (Closes: #475568) + * runtime/scripts.vim: + - Detect Mozilla Thunderbird's mbox file as mail filetype. Thanks to + Kevin B. McCarty for the patch. (Closes: #475300) + * runtime/filetype.vim: + - Add detection of more passwd/shadow related files. Based on a patch by + Jarek Kami?ski. (Closes: #420304) + - Improve filetype detection of strace logs. Thanks to Philipp Marek for + the patch. (Closes: #473967) + - Add filetype detection of more Apache config files. Thanks to Josh + Triplett and Xavier Guimard for the patch. (Closes: #421312) + - Fix a missing comma in the cron filetype detection. + + -- James Vega Wed, 23 Apr 2008 13:46:26 -0400 + vim (1:7.1.293-1) unstable; urgency=low * debian/control: -- Vim packaging From jamessan at debian.org Wed Apr 23 19:00:52 2008 From: jamessan at debian.org (James Vega) Date: Wed, 23 Apr 2008 19:00:52 +0000 Subject: [SCM] Vim packaging annotated tag, debian/7.1.293-2, created. debian/7.1.293-2 Message-ID: The annotated tag, debian/7.1.293-2 has been created at be34d7d7ab72c8ff6cfedad3b5f59fec3f2345b6 (tag) tagging 519b82d3f78f117fa6ae71d7ee9c8ac975c3cb5b (commit) replaces debian/7.1.293-1 tagged by James Vega on Wed Apr 23 15:00:36 2008 -0400 - Shortlog ------------------------------------------------------------ Debian release 1:7.1.293-2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iEYEABECAAYFAkgPh1cACgkQDb3UpmEybUB97QCeLN/VH/3aTsAWLItfWfnV+EO5 LKAAoJrelJHukp+6pXfMXOQbs6YsGekX =CAyI -----END PGP SIGNATURE----- James Vega (40): Import patches/debsources.vim-syntax.diff Import patches/de.po.diff Import patches/dosini.vim-hash_comment.diff Import patches/filetype.vim-better_tex_vs_plaintex.diff Import patches/filetype.vim-debfiles.diff Import patches/filetype.vim-udev.d.diff Import patches/javac_cmdline-vim.diff Import patches/lhaskell.vim-syntax.diff Import patches/make.vim-syntax.diff Import patches/map.vim-syntax.diff Import patches/perl.vim-ftplugin_perldoc.diff Import patches/po.vim.diff Import patches/python.vim-ftplugin_{include,pydoc}.diff Import patches/ruby.vim_indent.diff Import patches/samba.vim.diff Import patches/scripts.vim.diff Import patches/tex.vim-syntax_additions.diff Import patches/verilog.vim_ftplugin-cpoptions.diff Import patches/xdefaults.vim.diff Import patches/mve.awk-interpreter.diff Import patches/vimspell.sh-typo.diff Add lenny distribution and debtorrent, rsh, ssh, cdrom, copy URIs. Recognize /etc/cron.d/* as crontab filetype. (#472375) Adjust 'modeline' help to indicate that Debian defaults it to off. Add .dpkg-{old,dist} to the list of extensions which are ignored when determining filetype. (#421314) Fix Perl's block indenting. Merge branch 'upstream' into deb/runtime Fix a missing comma in the cron filetype detection. Add filetype detection of more Apache config files. Improve filetype detection of strace logs. Add detection of more passwd/shadow related files. Detect Mozilla Thunderbird's mbox file as mail filetype. Support highlighting of RFC3339 timestamps. Correct the vim-common and vim-runtime descriptions. Fix expansion of @VIMCUR@ in vimrc.tiny. Move vimrc.tiny from vim-common to vim-tiny. Separate out the install-stamp-vim-tiny target. Remove some unneeded line continuations. Merge branches 'debian' and 'deb/runtime' Release 7.1.293-2 ----------------------------------------------------------------------- -- Vim packaging From installer at ftp-master.debian.org Wed Apr 23 19:02:09 2008 From: installer at ftp-master.debian.org (Debian Installer) Date: Wed, 23 Apr 2008 19:02:09 +0000 Subject: vim_7.1.293-2_i386.changes ACCEPTED Message-ID: Accepted: vim-common_7.1.293-2_i386.deb to pool/main/v/vim/vim-common_7.1.293-2_i386.deb vim-dbg_7.1.293-2_i386.deb to pool/main/v/vim/vim-dbg_7.1.293-2_i386.deb vim-doc_7.1.293-2_all.deb to pool/main/v/vim/vim-doc_7.1.293-2_all.deb vim-full_7.1.293-2_all.deb to pool/main/v/vim/vim-full_7.1.293-2_all.deb vim-gnome_7.1.293-2_i386.deb to pool/main/v/vim/vim-gnome_7.1.293-2_i386.deb vim-gtk_7.1.293-2_i386.deb to pool/main/v/vim/vim-gtk_7.1.293-2_i386.deb vim-gui-common_7.1.293-2_all.deb to pool/main/v/vim/vim-gui-common_7.1.293-2_all.deb vim-lesstif_7.1.293-2_i386.deb to pool/main/v/vim/vim-lesstif_7.1.293-2_i386.deb vim-nox_7.1.293-2_i386.deb to pool/main/v/vim/vim-nox_7.1.293-2_i386.deb vim-perl_7.1.293-2_all.deb to pool/main/v/vim/vim-perl_7.1.293-2_all.deb vim-python_7.1.293-2_all.deb to pool/main/v/vim/vim-python_7.1.293-2_all.deb vim-ruby_7.1.293-2_all.deb to pool/main/v/vim/vim-ruby_7.1.293-2_all.deb vim-runtime_7.1.293-2_all.deb to pool/main/v/vim/vim-runtime_7.1.293-2_all.deb vim-tcl_7.1.293-2_all.deb to pool/main/v/vim/vim-tcl_7.1.293-2_all.deb vim-tiny_7.1.293-2_i386.deb to pool/main/v/vim/vim-tiny_7.1.293-2_i386.deb vim_7.1.293-2.diff.gz to pool/main/v/vim/vim_7.1.293-2.diff.gz vim_7.1.293-2.dsc to pool/main/v/vim/vim_7.1.293-2.dsc vim_7.1.293-2_i386.deb to pool/main/v/vim/vim_7.1.293-2_i386.deb Override entries for your package: vim-common_7.1.293-2_i386.deb - important editors vim-dbg_7.1.293-2_i386.deb - extra editors vim-doc_7.1.293-2_all.deb - optional doc vim-full_7.1.293-2_all.deb - extra editors vim-gnome_7.1.293-2_i386.deb - extra editors vim-gtk_7.1.293-2_i386.deb - extra editors vim-gui-common_7.1.293-2_all.deb - optional editors vim-lesstif_7.1.293-2_i386.deb - extra editors vim-nox_7.1.293-2_i386.deb - extra editors vim-perl_7.1.293-2_all.deb - extra editors vim-python_7.1.293-2_all.deb - extra editors vim-ruby_7.1.293-2_all.deb - extra editors vim-runtime_7.1.293-2_all.deb - optional editors vim-tcl_7.1.293-2_all.deb - extra editors vim-tiny_7.1.293-2_i386.deb - important editors vim_7.1.293-2.dsc - source editors vim_7.1.293-2_i386.deb - optional editors Announcing to debian-devel-changes at lists.debian.org Closing bugs: 420304 421312 473967 475300 475568 477379 Thank you for your contribution to Debian. From owner at bugs.debian.org Wed Apr 23 19:06:11 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Wed, 23 Apr 2008 19:06:11 +0000 Subject: Bug#473967: marked as done ([vim-runtime] Improve strace filetype detection) References: <200804021311.42510.philipp.marek@bmlv.gv.at> Message-ID: Your message dated Wed, 23 Apr 2008 19:02:09 +0000 with message-id and subject line Bug#473967: fixed in vim 1:7.1.293-2 has caused the Debian Bug report #473967, regarding [vim-runtime] Improve strace filetype detection to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 473967: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473967 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: "Ph. Marek" Subject: vim: Enhancement for strace file type detection Date: Wed, 2 Apr 2008 13:11:42 +0200 Size: 3276 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/62f3a23e/attachment-0002.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#473967: fixed in vim 1:7.1.293-2 Date: Wed, 23 Apr 2008 19:02:09 +0000 Size: 11157 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/62f3a23e/attachment-0003.eml From owner at bugs.debian.org Wed Apr 23 19:06:15 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Wed, 23 Apr 2008 19:06:15 +0000 Subject: Bug#475300: marked as done ([vim-runtime] Recognize Mozilla-generated mbox files) References: <47FD32FD.7070202@debian.org> Message-ID: Your message dated Wed, 23 Apr 2008 19:02:09 +0000 with message-id and subject line Bug#475300: fixed in vim 1:7.1.293-2 has caused the Debian Bug report #475300, regarding [vim-runtime] Recognize Mozilla-generated mbox files to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 475300: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475300 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: "Kevin B. McCarty" Subject: vim: slight tweak to detection of "mail" format files Date: Wed, 09 Apr 2008 14:19:57 -0700 Size: 5119 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/f2dcd416/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#475300: fixed in vim 1:7.1.293-2 Date: Wed, 23 Apr 2008 19:02:09 +0000 Size: 11157 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/f2dcd416/attachment-0001.eml From owner at bugs.debian.org Wed Apr 23 19:06:20 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Wed, 23 Apr 2008 19:06:20 +0000 Subject: Bug#477379: marked as done (vimrc.tiny contains unsubstituted @VIMCUR@ macro (runtimepath)) References: <20080422184934.15970.42038.reportbug@base.local> Message-ID: Your message dated Wed, 23 Apr 2008 19:02:09 +0000 with message-id and subject line Bug#477379: fixed in vim 1:7.1.293-2 has caused the Debian Bug report #477379, regarding vimrc.tiny contains unsubstituted @VIMCUR@ macro (runtimepath) to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 477379: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477379 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Daniel Hahler Subject: vimrc.tiny contains unsubstituted @VIMCUR@ macro (runtimepath) Date: Tue, 22 Apr 2008 20:49:34 +0200 Size: 6053 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/6673ec47/attachment-0002.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#477379: fixed in vim 1:7.1.293-2 Date: Wed, 23 Apr 2008 19:02:09 +0000 Size: 11157 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/6673ec47/attachment-0003.eml From owner at bugs.debian.org Wed Apr 23 19:06:08 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Wed, 23 Apr 2008 19:06:08 +0000 Subject: Bug#420304: marked as done ([vim-runtime] Detect more passwd/group files) References: <20070421140618.GA23733@Omega.vilo.eu.org> Message-ID: Your message dated Wed, 23 Apr 2008 19:02:09 +0000 with message-id and subject line Bug#420304: fixed in vim 1:7.1.293-2 has caused the Debian Bug report #420304, regarding [vim-runtime] Detect more passwd/group files to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 420304: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=420304 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Jarek =?iso-8859-2?Q?Kami=F1ski?= Subject: /usr/share/vim/vim70/filetype.vim: Please detect more passwd/group files Date: Sat, 21 Apr 2007 16:06:18 +0200 Size: 4852 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/cdfb5b65/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#420304: fixed in vim 1:7.1.293-2 Date: Wed, 23 Apr 2008 19:02:09 +0000 Size: 11157 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/cdfb5b65/attachment-0001.eml From owner at bugs.debian.org Wed Apr 23 19:06:10 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Wed, 23 Apr 2008 19:06:10 +0000 Subject: Bug#421312: marked as done ([vim-runtime] Detect more apache config files) References: <20070427194848.26669.94775.reportbug@josh-mobile> Message-ID: Your message dated Wed, 23 Apr 2008 19:02:09 +0000 with message-id and subject line Bug#421312: fixed in vim 1:7.1.293-2 has caused the Debian Bug report #421312, regarding [vim-runtime] Detect more apache config files to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 421312: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=421312 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Josh Triplett Subject: /usr/share/vim/vim70/filetype.vim: Please support apache configuration files in /etc/apache2/{conf.d, sites-*, mods-*} Date: Fri, 27 Apr 2007 12:48:48 -0700 Size: 3034 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/2b56bf67/attachment-0002.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#421312: fixed in vim 1:7.1.293-2 Date: Wed, 23 Apr 2008 19:02:09 +0000 Size: 11157 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/2b56bf67/attachment-0003.eml From owner at bugs.debian.org Wed Apr 23 19:06:18 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Wed, 23 Apr 2008 19:06:18 +0000 Subject: Bug#475568: marked as done ([vim-runtime] Recognize RFC 3339 high-precision timestamps) References: <20080411180524.26732.79363.reportbug@pluto.milchstrasse.xx> Message-ID: Your message dated Wed, 23 Apr 2008 19:02:09 +0000 with message-id and subject line Bug#475568: fixed in vim 1:7.1.293-2 has caused the Debian Bug report #475568, regarding [vim-runtime] Recognize RFC 3339 high-precision timestamps to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 475568: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475568 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Michael Biebl Subject: /usr/share/vim/vim71/syntax/messages.vim: Please add support for RFC 3339 high precision timestamps Date: Fri, 11 Apr 2008 20:05:24 +0200 Size: 2818 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/ef638b1d/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Bug#475568: fixed in vim 1:7.1.293-2 Date: Wed, 23 Apr 2008 19:02:09 +0000 Size: 11157 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080423/ef638b1d/attachment-0001.eml From zack at debian.org Fri Apr 25 05:26:05 2008 From: zack at debian.org (Stefano Zacchiroli) Date: Fri, 25 Apr 2008 13:26:05 +0800 Subject: RFC: Gatekeeper - control which plugins are loaded In-Reply-To: <20080422223608.GA12738@flik.wdw> References: <20080422004921.97636a0b.mb@kotka.de> <20080422223608.GA12738@flik.wdw> Message-ID: <20080425052605.GA11981@aquarium.takhisis.invalid> [ resent: the first one was bounced back by google groups ] On Tue, Apr 22, 2008 at 06:36:08PM -0400, Marvin Renich wrote: > Actually, I like Debian's approach (thanks Debian Vim Maintainers and > especially Stefano Zacchiroli). Rather than force every plugin to use a Marvin, thanks both for the kudos and for forwarding to us this thread handle. I'm no longer following actively vim-dev these days, but I believe James Vega (the most active vim maintainers in Debian these days, and which deserves the kudos part on our responsiveness :)) does. My thought on this issue is as follows. I don't like reinventing wheels, and it is what possibly happened with Gatekeeper. I hope your message can help fixing this. We would be very happy Debian-side if our vim-addon-manager solution will spread outside Debian boundaries, it is by no means Debian-specific. Our policies for how to handle this are stored in the Debian Vim policy (http://pkg-vim.alioth.debian.org/vim-policy.html/) and can be read be whoever wants. Similarly, the vim-addons source code is available and free software. The implementation is probably suboptimal, but it is not a complicated piece of code, if there is interest in the wider vim-dev community we might even rewrite it from scratch! implementing perceived needs. Just let us know. Please remember to Cc pkg-vim-maintainers at lists.alioth.debian.org if you want to be sure that me, or someone else of the Debian vim maintainers, follows this thread. Cheers. -- Stefano Zacchiroli -*- PhD in Computer Science ............... now what? zack@{upsilon.cc,cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ? /\ All one has to do is hit the (15:57:15) Bac: no, la demo scema \/ right keys at the right time -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: Digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/93a59775/attachment.pgp From zack at debian.org Fri Apr 25 07:21:32 2008 From: zack at debian.org (Stefano Zacchiroli) Date: Fri, 25 Apr 2008 15:21:32 +0800 Subject: RFC: Gatekeeper - control which plugins are loaded In-Reply-To: <20080425052605.GA11981@aquarium.takhisis.invalid> References: <20080422004921.97636a0b.mb@kotka.de> <20080422223608.GA12738@flik.wdw> <20080425052605.GA11981@aquarium.takhisis.invalid> Message-ID: <20080425072132.GA15146@aquarium.takhisis.invalid> On Fri, Apr 25, 2008 at 01:26:05PM +0800, Stefano Zacchiroli wrote: > [ resent: the first one was bounced back by google groups ] I gave up, even though I'm now registered I was unable to post to vim-dev (and no, I don't want to subscribe to the mailing list). Crappy google groups. James, I assume you are still following vim-dev, right? Then please post here when/if the gatekeeper discussions reach some relevant milestone. TIA, Cheers. -- Stefano Zacchiroli -*- PhD in Computer Science ............... now what? zack@{upsilon.cc,cs.unibo.it,debian.org} -<%>- http://upsilon.cc/zack/ (15:56:48) Zack: e la demo dema ? /\ All one has to do is hit the (15:57:15) Bac: no, la demo scema \/ right keys at the right time -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: Digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/685c24e8/attachment.pgp From linkportal at 777a.de Fri Apr 25 09:34:04 2008 From: linkportal at 777a.de (Esoterikportal) Date: Fri, 25 Apr 2008 11:34:04 +0200 Subject: Linkportal =?UTF-8?B?ZsO8cg==?= Ihre Website Message-ID: <4900147105468755@smtp.1und1.de> ************INFO**********INFO***********INFO************ Liebe Webmaster, unser Linkportal wurde neu eingerichtet und steht jetzt f?r Ihre Eintr?ge kostenlos zur Verf?gung. Sie wissen bestimmt, dass Ihre Homepage durch einen Eintrag nicht nur einem breiten Puplikum pr?sentiert wird, sondern sie steigt auch im Pageranking von Suchmaschinen. Kostenlose Werbung f?r Ihren Shop oder Dienstleistung ist die beste Werbung. M?chten Sie keinen Newsletter mehr erhalten, dann bitte kurze Nachricht mit Betreff: "abmelden" an diese e-Mail Adresse: linkportal at 777a.de www.esoterikportal.777a.de/ * linkportal at 777a.de -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/8f9fa4d8/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: linkemblem.jpg Type: image/jpeg Size: 56146 bytes Desc: not available Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/8f9fa4d8/attachment-0001.jpg From mrvn at renich.org Fri Apr 25 11:26:03 2008 From: mrvn at renich.org (Marvin Renich) Date: Fri, 25 Apr 2008 07:26:03 -0400 Subject: (forw) Re: RFC: Gatekeeper - control which plugins are loaded In-Reply-To: <20080422223608.GA12738@flik.wdw> Message-ID: <20080425112602.GA4058@flik.wdw> Stefano was having trouble sending to the group, so I am forwarding this for him. ...Marvin -------------- next part -------------- An embedded message was scrubbed... From: Stefano Zacchiroli Subject: Re: RFC: Gatekeeper - control which plugins are loaded Date: Fri, 25 Apr 2008 13:26:05 +0800 Size: 4073 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/7c5d0e81/attachment.eml From mrvn at renich.org Fri Apr 25 11:37:53 2008 From: mrvn at renich.org (Marvin Renich) Date: Fri, 25 Apr 2008 07:37:53 -0400 Subject: RFC: Gatekeeper - control which plugins are loaded In-Reply-To: <20080425072132.GA15146@aquarium.takhisis.invalid> References: <20080422004921.97636a0b.mb@kotka.de> <20080422223608.GA12738@flik.wdw> <20080425052605.GA11981@aquarium.takhisis.invalid> <20080425072132.GA15146@aquarium.takhisis.invalid> Message-ID: <20080425113752.GB4058@flik.wdw> * Stefano Zacchiroli [080425 03:22]: > On Fri, Apr 25, 2008 at 01:26:05PM +0800, Stefano Zacchiroli wrote: > > [ resent: the first one was bounced back by google groups ] > > I gave up, even though I'm now registered I was unable to post to > vim-dev (and no, I don't want to subscribe to the mailing list). Crappy > google groups. > > James, > I assume you are still following vim-dev, right? Then please post here > when/if the gatekeeper discussions reach some relevant milestone. > > TIA, > Cheers. > I forwarded your other message to the list. I have been having trouble lately with the @vim.org list addresses, which are now just forwarders to the corresponding @googlegroups.com lists. Unfortunately, the list names are not the same: vim-dev at vim.org -> vim_dev at googlegroups.com, vim at vim.org -> vim_use at googlegroups.com. Sending to the googlegroups address seems to work better. I don't like google groups either, but as Bram is now employed by Google and the old vim.org mail servers went away, that is what he opted for. ...Marvin From info at noctus.net Fri Apr 25 11:34:23 2008 From: info at noctus.net (Mathias Brodala) Date: Fri, 25 Apr 2008 13:34:23 +0200 Subject: Bug#477802: vim-common: Set textwidth for reportbug mails Message-ID: <20080425113423.31456.24319.reportbug@core2.local> Package: vim-common Version: 1:7.1-138+2.1~tango Severity: wishlist -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Please add tw=80 or tw=72 to augroup debian in /usr/share/vim/vim71/debian.vim. I always have to do this manually when attempting to write a bugreport via reportbug. Since debian.vim sets the filetype to mail, tw should be set to 72 according to mail.vim, but strangely isn't. (And please don't mind the Version I'm using.) - -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.24-1-686 (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to de_DE.UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages vim-common depends on: ii libc6 2.7-10 GNU C Library: Shared libraries Versions of packages vim-common recommends: ii vim 1:7.1-138+2.1~tango Vi IMproved - enhanced vi editor ii vim-gtk 1:7.1-138+2.1~tango Vi IMproved - enhanced vi editor - - -- no debconf information -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFIEcG/YfUFJ3ewsJgRAi9ZAJ47eAF/8ySgocLc7b4JIwVlIckchwCbBlcs XWjVyH4omKv6Rsa19pvctm4= =yKkw -----END PGP SIGNATURE----- From owner at bugs.debian.org Fri Apr 25 13:48:04 2008 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 25 Apr 2008 13:48:04 +0000 Subject: Bug#477802: marked as done (vim-common: Set textwidth for reportbug mails) References: <20080425134550.GI23248@jamessan.com> <20080425113423.31456.24319.reportbug@core2.local> Message-ID: Your message dated Fri, 25 Apr 2008 09:45:50 -0400 with message-id <20080425134550.GI23248 at jamessan.com> and subject line Re: Bug#477802: vim-common: Set textwidth for reportbug mails has caused the Debian Bug report #477802, regarding vim-common: Set textwidth for reportbug mails to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 477802: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477802 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Mathias Brodala Subject: vim-common: Set textwidth for reportbug mails Date: Fri, 25 Apr 2008 13:34:23 +0200 Size: 2629 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/7b44d56e/attachment.eml -------------- next part -------------- An embedded message was scrubbed... From: James Vega Subject: Re: Bug#477802: vim-common: Set textwidth for reportbug mails Date: Fri, 25 Apr 2008 09:45:50 -0400 Size: 2907 Url: http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/7b44d56e/attachment-0001.eml From jamessan at debian.org Fri Apr 25 14:15:59 2008 From: jamessan at debian.org (James Vega) Date: Fri, 25 Apr 2008 14:15:59 +0000 Subject: [SCM] Vim packaging branch, debian, updated. upstream/7.1.285-90-g90b6b3e Message-ID: The following commit has been merged in the debian branch: commit 90b6b3e457454752e4607719ae7aef5f46b6cc79 Author: James Vega Date: Fri Apr 25 10:04:02 2008 -0400 Update the list of supported Ubuntu releases. Since Hardy was just released, Edgy will be end-of-lifed at the end of this month and Intrepid is the next release. Signed-off-by: James Vega diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim index f2b8a8e..e751fbc 100644 --- a/runtime/syntax/debchangelog.vim +++ b/runtime/syntax/debchangelog.vim @@ -19,7 +19,7 @@ syn case ignore " Define some common expressions we can use later on syn match debchangelogName contained "^[[:alpha:]][[:alnum:].+-]\+ " syn match debchangelogUrgency contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\=" -syn match debchangelogTarget contained "\v %(%(old)=stable|frozen|unstable|%(testing-|%(old)=stable-)=proposed-updates|experimental|%(sarge|etch|lenny)-%(backports|volatile)|%(testing|%(old)=stable)-security|%(dapper|edgy|feisty|gutsy|hardy)%(-%(security|proposed|updates|backports|commercial|partner))=)+" +syn match debchangelogTarget contained "\v %(%(old)=stable|frozen|unstable|%(testing-|%(old)=stable-)=proposed-updates|experimental|%(sarge|etch|lenny)-%(backports|volatile)|%(testing|%(old)=stable)-security|%(dapper|feisty|gutsy|hardy|intrepid)%(-%(security|proposed|updates|backports|commercial|partner))=)+" syn match debchangelogVersion contained "(.\{-})" syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*" syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*" -- Vim packaging From jamessan at debian.org Fri Apr 25 14:37:59 2008 From: jamessan at debian.org (James Vega) Date: Fri, 25 Apr 2008 14:37:59 +0000 Subject: [SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-56-ge612dc1 Message-ID: The following commit has been merged in the deb/runtime branch: commit e612dc1882c0a8d80733c0c2f651a7d82d219df7 Author: James Vega Date: Fri Apr 25 10:35:40 2008 -0400 Update the list of supported Ubuntu releases. Signed-off-by: James Vega diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim index d33cd9a..6fc008d 100644 --- a/runtime/syntax/debsources.vim +++ b/runtime/syntax/debsources.vim @@ -26,7 +26,7 @@ syn match debsourcesComment /#.*/ " Match uri's syn match debsourcesUri +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' <>"]\++ -syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(sarge\|etch\|lenny\|\(old\)\=stable\|testing\|unstable\|sid\|experimental\|dapper\|edgy\|feisty\|gutsy\|hardy\)\([-[:alnum:]_./]*\)+ +syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(sarge\|etch\|lenny\|\(old\)\=stable\|testing\|unstable\|sid\|experimental\|dapper\|feisty\|gutsy\|hardy\|intrepid\)\([-[:alnum:]_./]*\)+ " Associate our matches and regions with pretty colours hi def link debsourcesLine Error -- Vim packaging From info at noctus.net Fri Apr 25 14:53:55 2008 From: info at noctus.net (Mathias Brodala) Date: Fri, 25 Apr 2008 16:53:55 +0200 Subject: Bug#477802: closed by James Vega (Re: Bug#477802: vim-common: Set textwidth for reportbug mails) In-Reply-To: References: <20080425134550.GI23248@jamessan.com> <20080425113423.31456.24319.reportbug@core2.local> Message-ID: <4811F083.5010109@noctus.net> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi. Debian Bug Tracking System, 25.04.2008 15:48: > On Fri, Apr 25, 2008 at 01:34:23PM +0200, Mathias Brodala wrote: >> Since debian.vim sets the filetype to mail, tw should be set to 72 according to >> mail.vim, but strangely isn't. > > mail.vim only changes 'textwidth' if it is at its default value of 0. > Otherwise, it follows the value the user has set it to, presumably in their > ~/.vimrc. I'm closing this bug since the behavior is as intended. Yeah, I read this in mail.vim. But why doesn?t this work on my system? I don?t specify any value for textwidth anywhere, so it should be 0. But there is no automatic linebreak if I type a bugreport. Also :echo &tw gives me 0 as response. What gives? Regards, Mathias - -- debian/rules -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIEfCDYfUFJ3ewsJgRAiUjAJ4q3SPZGGFxy7534XUb9pI5SVw3dgCfRz9o dpxDm4Li4ZxkKTkYEvqkPAc= =EDRj -----END PGP SIGNATURE----- From jamessan at debian.org Fri Apr 25 15:29:14 2008 From: jamessan at debian.org (James Vega) Date: Fri, 25 Apr 2008 11:29:14 -0400 Subject: Bug#477802: closed by James Vega (Re: Bug#477802: vim-common: Set textwidth for reportbug mails) In-Reply-To: <4811F083.5010109@noctus.net> References: <20080425134550.GI23248@jamessan.com> <20080425113423.31456.24319.reportbug@core2.local> <4811F083.5010109@noctus.net> Message-ID: <20080425152914.GK23248@jamessan.com> On Fri, Apr 25, 2008 at 04:53:55PM +0200, Mathias Brodala wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi. > > Debian Bug Tracking System, 25.04.2008 15:48: > > On Fri, Apr 25, 2008 at 01:34:23PM +0200, Mathias Brodala wrote: > >> Since debian.vim sets the filetype to mail, tw should be set to 72 according to > >> mail.vim, but strangely isn't. > > > > mail.vim only changes 'textwidth' if it is at its default value of 0. > > Otherwise, it follows the value the user has set it to, presumably in their > > ~/.vimrc. I'm closing this bug since the behavior is as intended. > > Yeah, I read this in mail.vim. But why doesn?t this work on my system? I > don?t specify any value for textwidth anywhere, so it should be 0. But > there is no automatic linebreak if I type a bugreport. > > Also :echo &tw gives me 0 as response. What gives? I just tested it on my system with the following setup: $ cat tmp.vim source /etc/vim/vimrc filetype plugin indent on $ touch reportbug.foo $ vim -u tmp.vim -N reportbug.foo :echo &tw 'textwidth' is properly set to 72, so it looks like something else is changing your 'textwidth' setting or you do not have filetype plugins enabled. Make sure ":filetype" reports at least "filetype detection:ON plugin:ON". Also verify that /usr/share/vim/vim71/ftplugin/mail.vim shows up in the output of ":scriptnames" and you can see what last set 'textwidth' by running ":verbose set tw?". Hope this helps narrow down the issue. -- James GPG Key: 1024D/61326D40 2003-09-02 James Vega -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: Digital signature Url : http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/attachments/20080425/017d8dc2/attachment.pgp From noreply at henning.makholm.net Wed Apr 30 22:39:56 2008 From: noreply at henning.makholm.net (Debian testing watch) Date: Wed, 30 Apr 2008 16:39:56 -0600 Subject: vim-latexsuite 20060325-5 MIGRATED to testing Message-ID: FYI: The status of the vim-latexsuite source package in Debian's testing distribution has changed. Previous version: 20060325-4.1 Current version: 20060325-5 -- This email is automatically generated; henning at makholm.net is responsible. See http://people.debian.org/~henning/trille/ for more information. From noreply at henning.makholm.net Wed Apr 30 22:39:56 2008 From: noreply at henning.makholm.net (Debian testing watch) Date: Wed, 30 Apr 2008 16:39:56 -0600 Subject: vim-latexsuite 20060325-5 MIGRATED to testing Message-ID: FYI: The status of the vim-latexsuite source package in Debian's testing distribution has changed. Previous version: 20060325-4.1 Current version: 20060325-5 -- This email is automatically generated; henning at makholm.net is responsible. See http://people.debian.org/~henning/trille/ for more information. From lucas at debian.org Sun Apr 20 06:27:44 2008 From: lucas at debian.org (WNPP Monitor) Date: Sun, 20 Apr 2008 06:27:44 -0000 Subject: [wnpp] vim-latexsuite has been orphaned Message-ID: The vim-latexsuite package in Debian has been orphaned, and needs a new maintainer. For more information, please read (You are receiving this mail because you are subscribed to vim-latexsuite on the Debian Package Tracking System.) From preining at logic.at Sun Apr 20 18:57:28 2008 From: preining at logic.at (Norbert Preining) Date: Sun, 20 Apr 2008 18:57:28 -0000 Subject: Bug#447106: vim-latexsuite doc not available Message-ID: <20080420184715.4398.84461.reportbug@mithrandir.pool8175.interbusiness.it> Package: vim-latexsuite Version: 20060325-5 Followup-For: Bug #447106 after running helpztags /usr/share/vim/addons/doc as root the documentation is still not available. $ ls -l /usr/share/vim/addons/doc/ total 128 -rw-r--r-- 1 root root 1995 2008-04-19 16:10 imaps.txt.gz -rw-r--r-- 1 root root 27734 2008-04-19 16:10 latexhelp.txt.gz -rw-r--r-- 1 root root 6714 2008-04-19 16:10 latex-suite-quickstart.txt.gz -rw-r--r-- 1 root root 41712 2008-04-19 16:10 latex-suite.txt.gz lrwxrwxrwx 1 root root 30 2008-04-16 19:19 matchit.txt -> ../../vim71/macros/matchit.txt -rw-r--r-- 1 root root 42109 2008-04-20 20:41 tags Hope that this helps -- Package-specific info: Vim related packages installed on this system: - vim-latexsuite - vim-runtime -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.25 (SMP w/2 CPU cores; PREEMPT) Locale: LANG=en_US.ISO-8859-15, LC_CTYPE=en_US.ISO-8859-15 (charmap=ISO-8859-15) Shell: /bin/sh linked to /bin/bash Versions of packages vim-latexsuite depends on: ii python 2.5.2-1 An interactive high-level object-o ii vim 1:7.1.293-1 Vi IMproved - enhanced vi editor ii vim-common 1:7.1.293-1 Vi IMproved - Common files ii vim-gnome [vim-python] 1:7.1.293-1 Vi IMproved - enhanced vi editor - Versions of packages vim-latexsuite recommends: ii texlive-base-bin 2007.dfsg.1-2 TeX Live: Essential binaries ii vim-addon-manager 0.4 manager of addons for the Vim edit -- no debconf information From urv at hispeed.ch Mon Apr 21 17:02:37 2008 From: urv at hispeed.ch (Arvin Moezzi) Date: Mon, 21 Apr 2008 17:02:37 -0000 Subject: Bug#447106: vim-latexsuite doc not available Message-ID: <20080421164127.GA12625@localdomain> Hi Norbert, I think you have to install the addon first with vim-addon. If you want to do it system wide then you have to the following # vim-addons -w install latex-suite otherwise just ignore the -w flag. But i think it is a bad idea not to mention it in the README file and the package vim-addon is only suggested not required by vim-latexsuite (see bug 434903). Hope this helped Cheers Arvin