Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: zle vi-mode tilde bug?



On Nov 21,  9:33pm, Phil Pennock wrote:
} Subject: zle vi-mode tilde bug?
}
} Looking at Zle/zle_vi.c (vioperswapcase) there is an explicit call to
} vifirstnonblank() which explains the behaviour, but not the reasoning.
} Just before that call, cs is reset to a saved value.
} 
} Am I missing something or is this a bug?  It seems ... strange.

I've been playing with this and I agree that the behavior is pretty odd.
The following patch seems to make it more sensible; with this patch, the
cursor always ends up at the end of the motion, except that on ~~ (upcase
the current line) it always ends up at the end of the line.

BTW, there doesn't seem to be any sensible way to use vi-oper-swap-case
on the very last character of any line. ~l just beeps because the cursor
can't move left.

"oldcs" is perhaps no longer the best name for the variable, but ...

Index: Src/Zle/zle_vi.c
===================================================================
--- zle_vi.c	1998/11/04 17:13:58	1.2
+++ zle_vi.c	1998/11/21 23:50:28
@@ -551,12 +551,15 @@
 void
 vioperswapcase(void)
 {
-    int oldcs, c2;
+    int oldcs = cs, oldbol = findbol(), c2;
 
     /* get the range */
     startvichange(1);
     if ((c2 = getvirange(0)) != -1) {
-	oldcs = cs;
+	if (cs < oldbol || c2 == oldcs)
+	    oldcs = cs;
+	else if (cs == oldcs || c2 >= findeol())
+	    oldcs = c2;
 	/* swap the case of all letters within range */
 	while (cs < c2) {
 	    if (islower(line[cs]))
@@ -565,9 +568,7 @@
 		line[cs] = tulower(line[cs]);
 	    cs++;
 	}
-	/* go back to the first line of the range */
 	cs = oldcs;
-	vifirstnonblank();
     }
     vichgflag = 0;
 }

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com



Messages sorted by: Reverse Date, Date, Thread, Author