[PATCH v4 2/5] notmuch-emacs-mua: support --no-window-system also for non-client

diff --git a/f2/e6f4f7c055fdd930d945a3f59615043c4488b3 b/f2/e6f4f7c055fdd930d945a3f59615043c4488b3
new file mode 100644 (file)
index 0000000..32abc1d
--- /dev/null
+++ b/f2/e6f4f7c055fdd930d945a3f59615043c4488b3
@@ -0,0 +1,115 @@
+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 382F86DE1A47\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:21 -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.041\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.041 tagged_above=-999 required=5 tests=[AWL=0.679,\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 NcLbroqqlNAh for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Aug 2015 02:05:19 -0700 (PDT)\r
+Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com\r
+ [209.85.212.178])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 9B12E6DE1908\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:16 -0700 (PDT)\r
+Received: by wicja10 with SMTP id ja10so35740055wic.1\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Aug 2015 02:05:15 -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=p2PIwIQzYIptyCOanTVsdqf8/jygiDVGt4ZQvJJyY0s=;\r
+ b=O4rbKhT7H5mRNqKgxnFmUOkcYbNNa9PDKB/P+wUH9ZJiZcRNic45CitUWCIkwG9QQR\r
+ 7tpkgHb7R3we8vP1lL4Db792M66C9mcZ7zZx/ZeH3e8r/RSY/W3O7bz09PadpJ6xcxmz\r
+ sCxfgYf47AGgD/X80yvX1Vlr5saQTXcwAqCeaUEQyjxujtgqS1PxiV+pM3xdAjFMmBsE\r
+ ve1P9zbg2/v00KG9dPqOJ0XA2AeH7uf8kl7xfZ7gpYP/O5XvuMXOR8r0teZ1HxnWjzNa\r
+ u/FpBGUGG6aIYAHVjqYFsjZ1OdM7pqngCkE3wwbWCrc7zkPsn0nIgnKpfwsD57AjtIzt\r
+ q5GA==\r
+X-Gm-Message-State:\r
+ ALoCoQn0NK4M5U20CPDj1IFbT61oIb5VrrBopCNhUTdzoquQlNDYDJ/bFrQvfdXAvIEQ/IKfbQe6\r
+X-Received: by 10.194.190.110 with SMTP id gp14mr8949965wjc.76.1439629515037; \r
+ Sat, 15 Aug 2015 02:05:15 -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 nb10sm6892234wic.11.2015.08.15.02.05.13\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 15 Aug 2015 02:05:14 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 2/5] notmuch-emacs-mua: support --no-window-system also for\r
+ non-client\r
+Date: Sat, 15 Aug 2015 12:05:12 +0300\r
+Message-Id:\r
+ <0ae250e962fee6c447cbd63a4f4928801713ee7f.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:21 -0000\r
+\r
+Clearly --no-window-system should be applicable without --client as\r
+well. Prepare for future changes with the naming of the variables.\r
+---\r
+ notmuch-emacs-mua | 10 ++++++----\r
+ 1 file changed, 6 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua\r
+index 79714305b3e2..e33aa955d6b5 100755\r
+--- a/notmuch-emacs-mua\r
++++ b/notmuch-emacs-mua\r
+@@ -34,8 +34,9 @@ EMACS=${EMACS-emacs}\r
+ EMACSCLIENT=${EMACSCLIENT-emacsclient}\r
+ \r
+ PRINT_ONLY=\r
++NO_WINDOW=\r
+ USE_EMACSCLIENT=\r
+-CLIENT_TYPE="-c"\r
++CREATE_FRAME="-c"\r
+ \r
+ # The crux of it all: construct an elisp progn and eval it.\r
+ ELISP="(prog1 'done (require 'notmuch) (notmuch-mua-new-mail)"\r
+@@ -103,7 +104,8 @@ while getopts :s:c:b:i:h opt; do\r
+           PRINT_ONLY=1\r
+           ;;\r
+       --no-window-system)\r
+-          CLIENT_TYPE="-t"\r
++          NO_WINDOW="-nw"\r
++          CREATE_FRAME=\r
+           ;;\r
+       *)\r
+           # We should never end up here.\r
+@@ -132,7 +134,7 @@ fi\r
+ \r
+ if [ -n "$USE_EMACSCLIENT" ]; then\r
+     # Evaluate the progn.\r
+-    exec ${EMACSCLIENT} ${CLIENT_TYPE} -a '' --eval "${ELISP}"\r
++    exec ${EMACSCLIENT} ${NO_WINDOW} ${CREATE_FRAME} -a '' --eval "${ELISP}"\r
+ else\r
+-    exec ${EMACS} --eval "${ELISP}"\r
++    exec ${EMACS} ${NO_WINDOW} --eval "${ELISP}"\r
+ fi\r
+-- \r
+2.1.4\r
+\r