don't set totally local options, we need to inherit octalzeroes

zsh-vi-more · Mar 14, 2020 · 0ad20fb · 0ad20fb
1 parent 38e8dad
commit 0ad20fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/functions/.vi-increment b/functions/.vi-increment
@@ -1,8 +1,7 @@
 #!/usr/bin/env zsh
 # take numeric prefix to command
 zle -f vichange
-emulate -L zsh
-setopt extendedglob
+setopt localoptions noksharrays extendedglob
 # start|end:        hex/other number start or end
 # odec_(start|end): the start or end of the longest matching [[:digit:]] string
 # base:             the value determines what type of number is matched
@@ -44,7 +43,7 @@ else
 	end=$reply[4]
 fi
 case $base in
-cbin0) # no cbases-0x[hex]-like option, have to manually strip prefix
+cbin) # no cbases-0x[hex]-like option, have to manually strip prefix
 	ans=$(( [#2] BUFFER[start,end] + d ))
 	sans="${ans#'2#'}"
 	(( start += 2 ))
@@ -58,8 +57,9 @@ chex)
 esac
 if (( zero )); then
 	local -Z $((1 + end - start )) ans
-	if [[ $base != chex && $options[cbases] = on && $options[octalzeroes] = on ]]; then
+	if [[ -z $base && $options[cbases] = on && $options[octalzeroes] = on ]]; then
 		local -i 8 ans
+		[[ $ans[1] = 0 ]] || sans=0$ans
 	fi
 fi
 BUFFER="$BUFFER[1,start-1]${sans:=$ans}$BUFFER[end+1,$#BUFFER]"

diff --git a/functions/.vi-increment::select-number b/functions/.vi-increment::select-number
@@ -44,7 +44,7 @@ local k v line=$BUFFER[lstart,lend]
 	# Is this after the last bin/hex number?
 	if ((p[ostart] > p[end])); then
 		p[base]=''
-		((p[start] = p[ostart], p[end] = ${${line[p[start],-1]}[(i)[^[:digit:]_]]} - 1 ))
+		((p[start] = p[ostart], p[end] = p[start] + ${${line:$p[ostart]}[(i)[^[:digit:]_]]} - 1))
 		if [[ $line[p[start]] = 0 ]]; then
 			p[zero]=1
 		fi