[PATCH] notmuch-emacs-mua: make --auto-daemon imply --create-frame

diff --git a/bd/7bf7361d918c940c806cdd14b823de22f8f49a b/bd/7bf7361d918c940c806cdd14b823de22f8f49a
new file mode 100644 (file)
index 0000000..c81e3b7
--- /dev/null
+++ b/bd/7bf7361d918c940c806cdd14b823de22f8f49a
@@ -0,0 +1,84 @@
+Return-Path: <too@guru-group.fi>\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 4CC1B6DE1804\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Sep 2015 23:36:52 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.182\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.182 tagged_above=-999 required=5 tests=[AWL=0.722, \r
+ RP_MATCHES_RCVD=-0.55, T_HEADER_FROM_DIFFERENT_DOMAINS=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 D6IzeoTRIEBW for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Sep 2015 23:36:50 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 347706DE17FE\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Sep 2015 23:36:50 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 78D231000CA; Wed, 30 Sep 2015 09:36:54 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] notmuch-emacs-mua: make --auto-daemon imply --create-frame\r
+Date: Wed, 30 Sep 2015 09:36:52 +0300\r
+Message-Id: <1443595012-22664-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.0.0\r
+Cc: 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: Wed, 30 Sep 2015 06:36:52 -0000\r
+\r
+Before this change with --auto-daemon but without --create-frame\r
+emacs server was started but no clients stay connected to it\r
+(in both graphical and terminal displays).\r
+\r
+Note that this changes how --client --auto-daemon works on\r
+graphical display; New emacs frame is now created for the\r
+message (and message-exit-actions hook appended).\r
+---\r
+ doc/man1/notmuch-emacs-mua.rst | 3 ++-\r
+ notmuch-emacs-mua              | 1 +\r
+ 2 files changed, 3 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/doc/man1/notmuch-emacs-mua.rst b/doc/man1/notmuch-emacs-mua.rst\r
+index c3689eb82c8a..7c5729047173 100644\r
+--- a/doc/man1/notmuch-emacs-mua.rst\r
++++ b/doc/man1/notmuch-emacs-mua.rst\r
+@@ -43,7 +43,8 @@ Supported options for **notmuch-emacs-mua** include\r
+ \r
+     ``--auto-daemon``\r
+         Automatically start Emacs in daemon mode, if the Emacs server\r
+-        is not running. Applicable with ``--client``.\r
++        is not running. Applicable with ``--client``. Implies\r
++        ``--create-frame``.\r
+ \r
+     ``--create-frame``\r
+         Create a new frame instead of trying to use the current Emacs\r
+diff --git a/notmuch-emacs-mua b/notmuch-emacs-mua\r
+index b51d8d0e2c5b..016fa12613c4 100755\r
+--- a/notmuch-emacs-mua\r
++++ b/notmuch-emacs-mua\r
+@@ -108,6 +108,7 @@ while getopts :s:c:b:i:h opt; do\r
+           ;;\r
+       --auto-daemon)\r
+           AUTO_DAEMON="--alternate-editor="\r
++          CREATE_FRAME="-c"\r
+           ;;\r
+       --create-frame)\r
+           CREATE_FRAME="-c"\r
+-- \r
+2.0.0\r
+\r