From ced1f1b7db08a54565451eaf6a8947378472e1d0 Mon Sep 17 00:00:00 2001
From: Julian Prein <druckdev@protonmail.com>
Date: Fri, 23 Jun 2023 22:02:35 +0200
Subject: [PATCH] zsh:diffcmds(): Get index of last `--` occurrence

---
 .config/zsh/zshrc.d/40-functions.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.config/zsh/zshrc.d/40-functions.zsh b/.config/zsh/zshrc.d/40-functions.zsh
index c9c312c..c8f7792 100644
--- a/.config/zsh/zshrc.d/40-functions.zsh
+++ b/.config/zsh/zshrc.d/40-functions.zsh
@@ -654,7 +654,8 @@ diffcmds() {
 		return 1
 	fi
 
-	i=${@[(ei)--]}
+	# Get index of last `--` occurrence
+	i=$(( # - ${${(aO)@}[(ei)--]} + 1 ))
 	if (( i >= # || i < 2 )); then
 		printf >&2 "%s\n" "Usage: $0 CMD [ARG...] [%%] [ARG...] -- ARG..."
 		return 1