Re: zsh: insert-last-word problem after completion

[Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>]

On Mon, 26 Apr 2010 17:42:10 +0200
Vincent Lefevre <vincent@xxxxxxxxxx> wrote:
> On 2010-04-26 13:11:39 +0100, Peter Stephenson wrote:
> > On Mon, 26 Apr 2010 12:53:31 +0200
> > Vincent Lefevre <vincent@xxxxxxxxxx> wrote:
> > > After a "zsh -f":
> > > 
> > > % alias my_echo=echo
> > > % false
> > > % true &
> > > % my_ech[TAB]
> > > 
> > > A succession of [ESC] . (bound to insert-last-word) gives:
> > > 
> > >   my_echo&
> > >   my_echo&&
> > >   my_echo&false
> 
> Actually I noticed the bug with the new completion system.

I've got there, too, eventually.

There are two ways to approach this: either have the "&" inserted as
now, with the space removed, which is the same as if the "&" was typed;
or fix the suffix when inserting the last word.  The drawback with the
former (which is what it's currently trying to do, but failing) is that
replacing the & with earlier words would leave the space before it
removed, and in most cases that won't be the right thing to do (you'd
get "my_echofalse" in this case).  So I think the latter is the right
answer---we know that what we're inserting always functions as a
complete word, hence fixing the space or whatever makes more sense even
if in the case of the first last word you happen not to need it.
This happens to be the simpler fix (though I have an implementation of
the other one, too).

By the way, as an alternative to smart-insert-last-word, what I do is
have the widget copy-earlier-word bound to ESC = so that I can get
earlier words from the line to which ESC . has taken me.

Index: Src/Zle/zle_hist.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_hist.c,v
retrieving revision 1.64
diff -p -u -r1.64 zle_hist.c
--- Src/Zle/zle_hist.c	18 Mar 2010 16:03:20 -0000	1.64
+++ Src/Zle/zle_hist.c	26 Apr 2010 22:29:11 -0000
@@ -634,6 +634,7 @@ insertlastword(char **args)
 	}
     }
 
+    fixsuffix();
     metafy_line();
     if (lastinsert && lastlen &&
 	lastpos <= zlemetacs &&

-- 
Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/