From: Jani Nikula <jani@nikula.org>
Date: Sat, 15 Aug 2015 09:05:13 +0000 (+0300)
Subject: [PATCH v4 3/5] notmuch-emacs-mua: move --client option handling around
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d300f6905988a882cbf94baad4caa350adcce42a;p=notmuch-archives.git

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

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