Merge branch 'release-4.16.1'

[i3/i3] / i3-sensible-editor

diff --git a/i3-sensible-editor b/i3-sensible-editor
index b3afceb7fa691ce3df5b8eeff19c97da48bdb4d3..dc95865ded332a403eb25e2d82bd08a5898b0bf6 100755 (executable)
--- a/i3-sensible-editor
+++ b/i3-sensible-editor
@@ -9,8 +9,8 @@
 # mechanism to find the preferred editor
 
 # Hopefully one of these is installed (no flamewars about preference please!):
-for editor in $VISUAL $EDITOR nano vim vi emacs pico qe mg jed gedit mc-edit; do
-    if which $editor > /dev/null 2>&1; then
-        exec $editor "$@"
+for editor in "$VISUAL" "$EDITOR" nano nvim vim vi emacs pico qe mg jed gedit mcedit gvim; do
+    if command -v "$editor" > /dev/null 2>&1; then
+        exec "$editor" "$@"
     fi
 done