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: Mon, 13 Jun 2022 11:34:49 +0200 Message-ID: <87ilp4yjyv.fsf@gnu.org> References: <87ilpaay1j.fsf@gnu.org> <87h74suo6g.fsf@dataswamp.org> <87mtehxgm2.fsf@gnu.org> <8735g90ytq.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17711"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: mu4e 1.7.27; emacs 29.0.50 Cc: Emanuel Berg , help-gnu-emacs@gnu.org To: Robert Pluim Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 13 11:48:10 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 1o0gg5-0004OH-DI for geh-help-gnu-emacs@m.gmane-mx.org; Mon, 13 Jun 2022 11:48:09 +0200 Original-Received: from localhost ([::1]:39990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0gg3-0002X6-OZ for geh-help-gnu-emacs@m.gmane-mx.org; Mon, 13 Jun 2022 05:48:07 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0geL-0002Wr-0g for help-gnu-emacs@gnu.org; Mon, 13 Jun 2022 05:46:23 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:35134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0geK-0001as-4O; Mon, 13 Jun 2022 05:46:20 -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=YjNugK76ZG21+Y26peUbrdKvcAdK256Tz6jRtDTec1E=; b=CVnl3cpk0tMqAU UaQ7O4ohdmduKGXZkRA1mTOOBav6SssfZOWHn0aoHNOPsAEq8JvwrE9cIrXG7HeoHnDA9MUWoOER4 mIpjy62Rrp2CRb8285ay7z4+EL+nUSVQ40d2zhwJXl5I+WcgdCh2sxh5vfL5yjj747s67a2FNE0FB e8LKvYqIZ693NNkEg6fMWL94xF3lUhFCr0pPwHTfYYapYvISTUbmsYl+s/4FHfeQ9KJem8WNaFgdZ wlLy9gi2Mq6rScu3WYTb/mH++g2bF5UJ8/LmWQZQOD13SIOHaxLGdCoHnpXAbi0ognkDneT9SPBoA +k2jCEGjWglxE2YOhfKg==; Original-Received: from auth1-smtp.messagingengine.com ([66.111.4.227]:46851) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0geJ-000246-HU; Mon, 13 Jun 2022 05:46:19 -0400 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id 4D80727C0054; Mon, 13 Jun 2022 05:46:19 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 13 Jun 2022 05:46:19 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddujedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfhgfhffvvefuffgjkfggtgfgsehtqhertddtreejnecuhfhrohhmpefvrghs shhilhhoucfjohhrnhcuoehtshguhhesghhnuhdrohhrgheqnecuggftrfgrthhtvghrnh epteeifeehieduhfejfeegtefftedthfekjefhudektddvveejtefhtdeluefggfeunecu ffhomhgrihhnpehsthgrtghkohhvvghrfhhlohifrdgtohhmnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhrnhdomhgvshhmthhprghu thhhphgvrhhsohhnrghlihhthidqkeeijeefkeejkeegqdeifeehvdelkedqthhsughhpe epghhnuhdrohhrghesfhgrshhtmhgrihhlrdhfmh X-ME-Proxy: Feedback-ID: ib2b94485:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 13 Jun 2022 05:46:18 -0400 (EDT) In-reply-to: <8735g90ytq.fsf@gmail.com> 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:137780 Archived-At: Robert Pluim writes: Hi Robert, > Tassilo> "emacsclient " exits on `server-edit' (C-x #) (or goes= to the next > Tassilo> buffer if more than one file were specified on the command l= ine) but > Tassilo> won't make emacs itself exit. So there is an exit code for = emacsclient > Tassilo> but it seem one cannot influence it. > > There=CA=BCs `server-edit-abort', but that doesn=CA=BCt (currently) allow= you to > tell emacsclient which exit code to use. I guess it could be extended. Maybe. I guess there's a problem with "emacsclient file1 file2" when you abort the edit of file1 but complete the one of file2. In the end, the exit code is probably not that important. At least the pacdiff script asks you if the merge result should be used. > >>> How do I print the merge buffer's contents to stdout? > >>=20 > >> Here is some material on that but if you use Emacs as a shell > >> tool you don't need it > >>=20 > >> https://stackoverflow.com/a/41435631 > > Tassilo> Indeed, > > Tassilo> (append-to-file (point-min) (point-max) "/dev/stdout") > > Except on platforms that don=CA=BCt have "/dev/stdout". Sure, but those don't matter to me. Maybe I'll bring that topic up on emacs-devel once I have a working solution for GNU systems. Thanks, Tassilo