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