From d4ff19f0033e96f9a61fc9b094b038426735c834 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Tue, 2 Dec 2014 09:51:33 -0500
Subject: fix calls to emacs_getopt_init

---
 common.sh       | 4 +++-
 ediff.sh.in     | 1 +
 emacsmail.sh.in | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

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"
-- 
cgit v1.2.3