From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.help Subject: Re: How to use emacs as a "diff3 -m" compatible merge tool? Date: Tue, 14 Jun 2022 09:50:47 +0200 Message-ID: <877d5jof00.fsf@gnu.org> References: <87ilpaay1j.fsf@gnu.org> <87h74suo6g.fsf@dataswamp.org> <87mtehxgm2.fsf@gnu.org> <874k0os1v2.fsf@dataswamp.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13995"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.7.26; emacs 29.0.50 Cc: help-gnu-emacs@gnu.org To: Emanuel Berg Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jun 14 09:56:40 2022 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o11Pj-0003QY-PY for geh-help-gnu-emacs@m.gmane-mx.org; Tue, 14 Jun 2022 09:56:39 +0200 Original-Received: from localhost ([::1]:56304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o11Pi-00058h-Cd for geh-help-gnu-emacs@m.gmane-mx.org; Tue, 14 Jun 2022 03:56:38 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o11PA-00058X-Hl for help-gnu-emacs@gnu.org; Tue, 14 Jun 2022 03:56:04 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:58938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o11P9-0008PZ-OS; Tue, 14 Jun 2022 03:56:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-reply-to:Date:Subject:To:From: References; bh=w13wtI7DrFDPMcQihtj0V6KDWKVp4UqlD1Ts66fdVMw=; b=rOzT27rfUJ2Lsv CAdA7mrzcX7521tTCix/gYuyKch5h2kNKcKgSefNfRVut4w3H94Km8C4ZJEUUgvh7g7jp+YETFM1k i5z6q1fdVYg4gjEHT6/PIu8wTv+nJy50OjABbpJKe5aP5dlGHY04/Eg2q9YaowOuLpLuk9vsAyN/b AVgbYH6l8wgF1OyX64YoLOmFKqySz1cFN8CedRCN3S4yvo1RAtn4hiT6Dp6/jz3/AbRNziAWTl1w4 6A9/etA9c4JWv6mYUHIB7zRWnsR0GLh8s2rM7D5tunLbdTx3xSyCvhr3K0IMA5ofEAea/g36IAC5R 4jjEwG6XKmLsOaSOja8w==; Original-Received: from auth1-smtp.messagingengine.com ([66.111.4.227]:40861) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o11P8-000823-WA; Tue, 14 Jun 2022 03:56:03 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailauth.nyi.internal (Postfix) with ESMTP id 99B8B27C0054; Tue, 14 Jun 2022 03:56:02 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 14 Jun 2022 03:56:02 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddukedguddvfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfhgfhffvvefuffgjkfggtgesth dtredttdertdenucfhrhhomhepvfgrshhsihhlohcujfhorhhnuceothhsughhsehgnhhu rdhorhhgqeenucggtffrrghtthgvrhhnpedujedtheduvdelffejkeetgedvheelhedvue efhfeukeekkeehvdfggeegffevgfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehthhhorhhnodhmvghsmhhtphgruhhthhhpvghrshhonhgrlh hithihqdekieejfeekjeekgedqieefhedvleekqdhtshguhheppehgnhhurdhorhhgsehf rghsthhmrghilhdrfhhm X-ME-Proxy: Feedback-ID: ib2b94485:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 14 Jun 2022 03:56:01 -0400 (EDT) In-reply-to: <874k0os1v2.fsf@dataswamp.org> X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "help-gnu-emacs" Xref: news.gmane.io gmane.emacs.help:137820 Archived-At: Emanuel Berg writes: >> "emacsclient " exits on `server-edit' (C-x #) (or goes >> to the next buffer if more than one file were specified on >> the command line) but won't make emacs itself exit. So there >> is an exit code for emacsclient but it seem one cannot >> influence it. > > OK, but is that hooked to whatever adheres to the interface you > showed, No, it's independent of my specific use-case but would be nice to have in general in scripting scenarios, i.e., where a script/program invokes emacsclient in order to let the user edit something where the user should be able to propagate back to the calling program if his edits were successfully completed or aborted. > if so what is that and how does that happen exactly? Sorry, I don't understand the question. Bye, Tassilo