[PATCH v4 3/5] notmuch-emacs-mua: move --client option handling around

diff --git a/02/f7f22a5afa03b6f0e4505293380ec13104832d b/02/f7f22a5afa03b6f0e4505293380ec13104832d
new file mode 100644 (file)
index 0000000..ac21c2b
--- /dev/null
+++ b/02/f7f22a5afa03b6f0e4505293380ec13104832d
@@ -0,0 +1,104 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 2A4536DE1A20\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.081\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.081 tagged_above=-999 required=5 tests=[AWL=0.639,\r
+  RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id UymGfB9wECwF for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Aug 2015 02:05:25 -0700 (PDT)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+ [209.85.212.181])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id E9B986DE190D\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:17 -0700 (PDT)\r
+Received: by wicja10 with SMTP id ja10so35740351wic.1\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:16 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=2gmmuzIxOB3vQFGk8rAklL4K8JMm8W6jVUOzWabzzgA=;\r
+ b=aJsvrHNk540kJrW9JOtQEMSt8tzPsvwX4ATgup0bBbCBmK8fXLf2nca72iqACxAPkg\r
+ +/dNnlwrMLPR0ksVff1bbynEV5yRwxpYZT3UY0vmzKSrUvpybL/p0t2NRHuN9NTjL6hg\r
+ TKM6y7vOMQ/LtwW9mr5oN5nQuKZwY7BQCRKYSHBmx/lpzjcqKravrCFrv27okqUOYe3m\r
+ xoucqXEuo/lLuTC7HD6c809M9egKuwdSzBkAwkq3nYV0iO6OjranX3KUGj4MQHtxeX2z\r
+ JWTe5JuXZaYaQDIaJzl4dcYYIixFr1IxOgWHnpTBk/+F5U3Bmltzkg3kOBHFUfbXEHCy\r
+ GPWA==\r
+X-Gm-Message-State:\r
+ ALoCoQliy8RTxv1zV44tKMoXzRP6qqrcJG8HT6+F6ix9EBTsF3Hk2p3e4tT4ZoAV0rj1Qkx13GSi\r
+X-Received: by 10.180.72.145 with SMTP id d17mr15410128wiv.69.1439629516516;\r
+ Sat, 15 Aug 2015 02:05:16 -0700 (PDT)\r
+Received: from localhost (mobile-access-bcee4f-131.dhcp.inet.fi.\r
+ [188.238.79.131])\r
+ by smtp.gmail.com with ESMTPSA id bq7sm11991334wjc.31.2015.08.15.02.05.15\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 15 Aug 2015 02:05:16 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 3/5] notmuch-emacs-mua: move --client option handling\r
+ around\r
+Date: Sat, 15 Aug 2015 12:05:13 +0300\r
+Message-Id:\r
+ <3e5f8994d8dc36c5a556c3f9a1a1c04df9ada650.1439629384.git.jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <cover.1439629384.git.jani@nikula.org>\r
+References: <cover.1439629384.git.jani@nikula.org>\r
+In-Reply-To: <cover.1439629384.git.jani@nikula.org>\r
+References: <cover.1439629384.git.jani@nikula.org>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 15 Aug 2015 09:05:27 -0000\r
+\r
+Move --client handling to a more suitable location. No functional\r
+changes.\r
+---\r
+ notmuch-emacs-mua | 6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua\r
+index e33aa955d6b5..1f088c42feb9 100755\r
+--- a/notmuch-emacs-mua\r
++++ b/notmuch-emacs-mua\r
+@@ -82,9 +82,6 @@ while getopts :s:c:b:i:h opt; do\r
+       --help|h)\r
+           exec man notmuch-emacs-mua\r
+           ;;\r
+-      --client)\r
+-          USE_EMACSCLIENT="yes"\r
+-          ;;\r
+       --subject|s)\r
+           ELISP="${ELISP} (message-goto-subject) (insert \"${OPTARG}\")"\r
+           ;;\r
+@@ -107,6 +104,9 @@ while getopts :s:c:b:i:h opt; do\r
+           NO_WINDOW="-nw"\r
+           CREATE_FRAME=\r
+           ;;\r
++      --client)\r
++          USE_EMACSCLIENT="yes"\r
++          ;;\r
+       *)\r
+           # We should never end up here.\r
+           echo "$0: internal error (option ${opt})." >&2\r
+-- \r
+2.1.4\r
+\r