Merge branch 'release/v4.3.0'v4.3.0

* release/v4.3.0:
  Bump VERSION
  Switch to using GNU Emacs on development machines
  Trim some trailing whitespace
  Clarify control flow in shell scripts
  Add clarifying comment
  Translate a short-circuit into a conditional
  Add a cheeky error message to sd()
  Strip trailing slashes from sd() target
  Correct error message from sd()

1 files changed, 4 insertions, 1 deletions

diff --git a/bin/eds.sh b/bin/eds.sh
index 7e719e9d..134fbdcb 100644
--- a/bin/eds.sh
+++ b/bin/eds.sh
@@ -23,7 +23,10 @@ esac
 
 # Prepend the path to each of the names given if they don't look like options
 for arg do
-    [ -n "$reset" ] || set -- && reset=1
+    if [ -z "$reset" ] ; then
+        set --
+        reset=1
+    fi
     case $arg in
         --)
             optend=1