From c8f72db3feca2a5db70153b5498a21982ef0f0e8 Mon Sep 17 00:00:00 2001
From: eximus <fabio4335@gmail.com>
Date: Fri, 20 Sep 2024 16:27:59 -0400
Subject: [PATCH 1/3] improve checking existance of fzf command (ignore
 aliases)

---
 fzf-marks.plugin.bash | 2 +-
 fzf-marks.plugin.zsh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fzf-marks.plugin.bash b/fzf-marks.plugin.bash
index d679bd3..c896c34 100644
--- a/fzf-marks.plugin.bash
+++ b/fzf-marks.plugin.bash
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-command -v fzf >/dev/null 2>&1 || return
+type -P fzf >/dev/null || return
 
 if [[ -z ${FZF_MARKS_FILE-} ]] ; then
     FZF_MARKS_FILE=$HOME/.fzf-marks
diff --git a/fzf-marks.plugin.zsh b/fzf-marks.plugin.zsh
index 02bf535..8609b49 100644
--- a/fzf-marks.plugin.zsh
+++ b/fzf-marks.plugin.zsh
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-command -v fzf >/dev/null 2>&1 || return
+type -P fzf >/dev/null || return
 
 if [[ -z ${FZF_MARKS_FILE-} ]] ; then
     FZF_MARKS_FILE=$HOME/.fzf-marks

From de2df93d64355343b8204f3f804c56935889fab6 Mon Sep 17 00:00:00 2001
From: Fabio <fabio4335@gmail.com>
Date: Sun, 22 Sep 2024 12:35:49 -0400
Subject: [PATCH 2/3] Update fzf-marks.plugin.zsh

Co-authored-by: Koichi Murase <myoga.murase@gmail.com>
---
 fzf-marks.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fzf-marks.plugin.zsh b/fzf-marks.plugin.zsh
index 8609b49..4f80bc7 100644
--- a/fzf-marks.plugin.zsh
+++ b/fzf-marks.plugin.zsh
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-type -P fzf >/dev/null || return
+type -p fzf >/dev/null || return
 
 if [[ -z ${FZF_MARKS_FILE-} ]] ; then
     FZF_MARKS_FILE=$HOME/.fzf-marks

From c9e1859fc8d07eb77f5d606cc2fb7c25f1b89a31 Mon Sep 17 00:00:00 2001
From: eximus <fabio4335@gmail.com>
Date: Tue, 24 Sep 2024 08:30:29 -0400
Subject: [PATCH 3/3] add 'command' to all fzf invocations to prevent picking
 up aliases

---
 fzf-marks.plugin.bash | 8 ++++----
 fzf-marks.plugin.zsh  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fzf-marks.plugin.bash b/fzf-marks.plugin.bash
index c896c34..8b6c39e 100644
--- a/fzf-marks.plugin.bash
+++ b/fzf-marks.plugin.bash
@@ -32,15 +32,15 @@ fi
 
 if [[ -z ${FZF_MARKS_COMMAND-} ]] ; then
 
-    _fzm_FZF_VERSION=$(fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
+    _fzm_FZF_VERSION=$(command fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
     _fzm_MINIMUM_VERSION=16001
 
     if [[ $_fzm_FZF_VERSION -gt $_fzm_MINIMUM_VERSION ]]; then
-        FZF_MARKS_COMMAND="fzf --height 40% --reverse"
+        FZF_MARKS_COMMAND="command fzf --height 40% --reverse"
     elif [[ ${FZF_TMUX:-1} -eq 1 ]]; then
-        FZF_MARKS_COMMAND="fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
+        FZF_MARKS_COMMAND="command fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
     else
-        FZF_MARKS_COMMAND="fzf"
+        FZF_MARKS_COMMAND="command fzf"
     fi
 fi
 
diff --git a/fzf-marks.plugin.zsh b/fzf-marks.plugin.zsh
index 4f80bc7..d12b99e 100644
--- a/fzf-marks.plugin.zsh
+++ b/fzf-marks.plugin.zsh
@@ -30,15 +30,15 @@ fi
 
 if [[ -z ${FZF_MARKS_COMMAND-} ]] ; then
 
-    _fzm_FZF_VERSION=$(fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
+    _fzm_FZF_VERSION=$(command fzf --version | awk -F. '{ print $1 * 1e6 + $2 * 1e3 + $3 }')
     _fzm_MINIMUM_VERSION=16001
 
     if [[ $_fzm_FZF_VERSION -gt $_fzm_MINIMUM_VERSION ]]; then
-        FZF_MARKS_COMMAND="fzf --height 40% --reverse"
+        FZF_MARKS_COMMAND="command fzf --height 40% --reverse"
     elif [[ ${FZF_TMUX:-1} -eq 1 ]]; then
-        FZF_MARKS_COMMAND="fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
+        FZF_MARKS_COMMAND="command fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}"
     else
-        FZF_MARKS_COMMAND="fzf"
+        FZF_MARKS_COMMAND="command fzf"
     fi
 fi