summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-12-02 09:51:33 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-12-02 09:51:33 -0500
commitd4ff19f0033e96f9a61fc9b094b038426735c834 (patch)
tree1b1d0701dbe9c21b4d875c7a95ea85d27f675e2c
parent77d0d249de22b399b1a87cb156837956ea4d7a65 (diff)
fix calls to emacs_getopt_init
-rw-r--r--common.sh4
-rw-r--r--ediff.sh.in1
-rw-r--r--emacsmail.sh.in1
3 files changed, 5 insertions, 1 deletions
diff --git a/common.sh b/common.sh
index 3d8c3ec..61fa26f 100644
--- a/common.sh
+++ b/common.sh
@@ -92,7 +92,9 @@ emacs_getopt() {
declare o="$1"
declare l="$2"
shift 2
- emacs_getopt_init
+ [[ -z "${emacs_getopt_o}" ]] ||
+ [[ -z "${emacs_getopt_l}" ]] ||
+ emacs_getopt_init
getopt -a \
-n "$0" \
-o "${emacs_getopt_o}${o}" \
diff --git a/ediff.sh.in b/ediff.sh.in
index 1c157bb..63b8238 100644
--- a/ediff.sh.in
+++ b/ediff.sh.in
@@ -38,6 +38,7 @@ main() {
declare mode=normal
declare cmd=ediff
+ emacs_getopt_init
declare args
args="$(emacs_getopt 3r recursive "$@")" || error=true
eval set -- "$args"
diff --git a/emacsmail.sh.in b/emacsmail.sh.in
index 05bd1f5..3ccaef3 100644
--- a/emacsmail.sh.in
+++ b/emacsmail.sh.in
@@ -35,6 +35,7 @@ main() {
declare error=false
declare mode=normal
+ emacs_getopt_init
declare args
args="$(emacs_getopt '' '' "$@")" || error=true
eval set -- "$args"