r1247 - in /trunk/packages/vim-scripts/debian: changelog patches/00list patches/lbdbq-inputlist.dpatch
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Apr 9 14:41:28 UTC 2008
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 <Enter> 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 <Enter> to cancel, as advertised. (Closes: #474599)
-- James Vega <jamessan at debian.org> 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 <jamessan at debian.org>
+##
+## 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 = *
More information about the pkg-vim-maintainers
mailing list