jump: fix for `marks' and CTRL+G key binding

- marks printed an error when $MARKPATH didn't exist or didn't have any marks in it. - The CTRL+G key binding overwrote an argument when it couldn't match it to an existing mark.

jump: fix for `marks' and CTRL+G key binding
561e7169 · Marc Cornellà · 3c5bbcf5 · 561e7169
Commit 561e7169 authored Feb 11, 2020 by Marc Cornellà
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

jump.plugin.zsh plugins/jump/jump.plugin.zsh +3 -3

No files found.
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -30,13 +30,13 @@ unmark() {
 marks() {
 	local link max=0
-	for link in $MARKPATH/{,.}*(@); do
+	for link in $MARKPATH/{,.}*(@N); do
 		if [[ ${#link:t} -gt $max ]]; then
 			max=${#link:t}
 		fi
 	done
 	local printf_markname_template="$(printf -- "%%%us " "$max")"
-	for link in $MARKPATH/{,.}*(@); do
+	for link in $MARKPATH/{,.}*(@N); do
 		local markname="$fg[cyan]${link:t}$reset_color"
 		local markpath="$fg[blue]$(readlink $link)$reset_color"
 		printf -- "$printf_markname_template" "$markname"
@@ -53,7 +53,7 @@ compctl -K _completemarks unmark
 _mark_expansion() {
 	setopt localoptions extendedglob
 	autoload -U modify-current-argument
-	modify-current-argument '$(readlink "$MARKPATH/$ARG")'
+	modify-current-argument '$(readlink "$MARKPATH/$ARG" || echo "$ARG")'
 }
 zle -N _mark_expansion
 bindkey "^g" _mark_expansion