[ksh/f18] fix another reproducer for tab completion

Michal Hlavinka mhlavink at fedoraproject.org
Thu Mar 7 15:36:34 UTC 2013


commit 2668a0728892cffc1ccd2ffe7911fe0e8cc90c1a
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Thu Mar 7 16:36:30 2013 +0100

    fix another reproducer for tab completion

 ksh-20120801-tabfix.patch |   11 +++++++----
 ksh.spec                  |    6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ksh-20120801-tabfix.patch b/ksh-20120801-tabfix.patch
index 59723ef..962763e 100644
--- a/ksh-20120801-tabfix.patch
+++ b/ksh-20120801-tabfix.patch
@@ -1,7 +1,7 @@
 diff -up ksh-20120801/src/cmd/ksh93/edit/emacs.c.tabfix ksh-20120801/src/cmd/ksh93/edit/emacs.c
---- ksh-20120801/src/cmd/ksh93/edit/emacs.c.tabfix	2013-01-04 16:50:21.124706144 +0100
-+++ ksh-20120801/src/cmd/ksh93/edit/emacs.c	2013-01-04 16:50:21.150706365 +0100
-@@ -1011,9 +1011,10 @@ static int escape(register Emacs_t* ep,r
+--- ksh-20120801/src/cmd/ksh93/edit/emacs.c.tabfix	2012-07-17 22:44:44.000000000 +0200
++++ ksh-20120801/src/cmd/ksh93/edit/emacs.c	2013-03-07 15:58:59.902161711 +0100
+@@ -1011,10 +1011,13 @@ static int escape(register Emacs_t* ep,r
  					ep->ed->e_tabcount=0;
  				else
  				{
@@ -9,7 +9,10 @@ diff -up ksh-20120801/src/cmd/ksh93/edit/emacs.c.tabfix ksh-20120801/src/cmd/ksh
  					i=ed_getchar(ep->ed,0);
  					ed_ungetchar(ep->ed,i);
 -					if(isdigit(i))
-+					if(oldi=='=' && isdigit(i))
++					if(isdigit(i) && oldi=='=')
  						ed_ungetchar(ep->ed,ESC);
++					else if (isdigit(i) || i=='\t')
++						ep->ed->e_tabcount=0;
  				}
  			}
+ 			else
diff --git a/ksh.spec b/ksh.spec
index 56f0bc3..de840ab 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -6,7 +6,7 @@ URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      EPL
 Version:      20120801
-Release:      7%{?dist}
+Release:      8%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source2:      kshcomp.conf
@@ -77,6 +77,7 @@ install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/kshrc
 install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/binfmt.d/kshcomp.conf
 
 %check
+[ -f ./skipcheck -o -f ./../skipcheck] && exit 0 ||:
 %if 0%{?rhel} > 6
 %ifarch s390
 exit 0
@@ -141,6 +142,9 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Mar 07 2013 Michal Hlavinka <mhlavink at redhat.com> - 20120801-8
+- fix another reproducer for tab completion
+
 * Fri Feb 22 2013 Michal Hlavinka <mhlavink at redhat.com> - 20120801-7
 - do not segfault on kill % (#914669)
 


More information about the scm-commits mailing list