[Pkg-tcltk-commits] r378 - in tclreadline/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-11-15 16:28:02 +0000 (Thu, 15 Nov 2007)
New Revision: 378

Added:
   tclreadline/trunk/debian/patches/completion_pbug.diff
Modified:
   tclreadline/trunk/debian/changelog
   tclreadline/trunk/debian/patches/series
Log:
  * Fixed syntax error in completer (the bug arises if a command with options
    started with a hyphen is completed).


Modified: tclreadline/trunk/debian/changelog
===================================================================
--- tclreadline/trunk/debian/changelog	2007-11-14 13:50:29 UTC (rev 377)
+++ tclreadline/trunk/debian/changelog	2007-11-15 16:28:02 UTC (rev 378)
@@ -7,11 +7,13 @@
   * Removed #!tclsh line from tclreadline init scripts since they aren't
     supposed to be executed directly.
   * Bumped debhelper compatibility level to 5.
+  * Fixed syntax error in completer (the bug arises if a command with options
+    started with a hyphen is completed).
 
   [ Francesco Paolo Lovergine ]
   * Added Homepage field in debian/control.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 20 Oct 2007 15:01:22 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 15 Nov 2007 19:26:42 +0300
 
 tclreadline (2.1.0-3) unstable; urgency=low
 

Added: tclreadline/trunk/debian/patches/completion_pbug.diff
===================================================================
--- tclreadline/trunk/debian/patches/completion_pbug.diff	                        (rev 0)
+++ tclreadline/trunk/debian/patches/completion_pbug.diff	2007-11-15 16:28:02 UTC (rev 378)
@@ -0,0 +1,24 @@
+Patch by Sergei Golovan fixes syntax error in expression.
+
+Index: tclreadline/tclreadlineCompleter.tcl
+===================================================================
+--- tclreadline.orig/tclreadlineCompleter.tcl
++++ tclreadline/tclreadlineCompleter.tcl
+@@ -3042,7 +3042,7 @@
+ proc complete(regsub) {text start end line pos mod} {
+ 	set prev [PreviousWord ${start} ${line}]
+ 	if {[llength ${prev}] && "--" != $prev && \
+-		("-" == [string index ${prev} 0] || 1 == ${pos)}} {
++		("-" == [string index ${prev} 0] || 1 == ${pos})} {
+ 		set cmds [RemoveUsedOptions ${line} {
+ 			-all -nocase --} {--}]
+ 		if {[llength ${cmds}]} {
+@@ -3449,7 +3449,7 @@
+ proc complete(switch) {text start end line pos mod} {
+ 	set prev [PreviousWord ${start} ${line}]
+ 	if {[llength ${prev}] && "--" != ${prev} && \
+-		("-" == [string index ${prev} 0] || 1 == ${pos)}} {
++		("-" == [string index ${prev} 0] || 1 == ${pos})} {
+ 		set cmds [RemoveUsedOptions ${line} {
+ 			-exact -glob -regexp --} {--}]
+ 		if {[llength ${cmds}]} {

Modified: tclreadline/trunk/debian/patches/series
===================================================================
--- tclreadline/trunk/debian/patches/series	2007-11-14 13:50:29 UTC (rev 377)
+++ tclreadline/trunk/debian/patches/series	2007-11-15 16:28:02 UTC (rev 378)
@@ -1,5 +1,6 @@
 manpage.diff
 tclshpath.diff
+completion_pbug.diff
 completion_matches.diff
 memuse.diff
 complete_nontcl.diff