From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.help Subject: Re: How to use emacs as a "diff3 -m" compatible merge tool? Date: Mon, 13 Jun 2022 10:09:21 +0200 Message-ID: <8735g90ytq.fsf@gmail.com> References: <87ilpaay1j.fsf@gnu.org> <87h74suo6g.fsf@dataswamp.org> <87mtehxgm2.fsf@gnu.org> 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="7855"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Emanuel Berg , help-gnu-emacs@gnu.org To: Tassilo Horn Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 13 10:11:14 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 1o0fAI-0001uB-4F for geh-help-gnu-emacs@m.gmane-mx.org; Mon, 13 Jun 2022 10:11:14 +0200 Original-Received: from localhost ([::1]:38632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0fAG-0008H4-T3 for geh-help-gnu-emacs@m.gmane-mx.org; Mon, 13 Jun 2022 04:11:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0f8v-0008Gw-Cc for help-gnu-emacs@gnu.org; Mon, 13 Jun 2022 04:09:49 -0400 Original-Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0f8f-0004dZ-Fi; Mon, 13 Jun 2022 04:09:49 -0400 Original-Received: by mail-wr1-x42c.google.com with SMTP id u8so6028613wrm.13; Mon, 13 Jun 2022 01:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:gmane-reply-to-list:date:in-reply-to :message-id:mime-version:content-transfer-encoding; bh=0KOqyTaVwuOLFBWozgCuFiJI1QIQAuE8yuj46hiabcw=; b=qMTI6zy3A66/8+Dvpf2ugbF2cJ5eAZknxlILGf8LqQbbLIErlEH7zIDXJ21ZUyg9K7 TixSTP6gBM2Yu0mJBks7fxabMoBUa9mCVS6bw167cLI1O1QC1FLWJIf+TLvShatZTjjE 7muQK9ThQ1RwmtoegElKV/PV4LFIA5raOZVbKHu/S7ZCvEFkLQxYNSKw7rgRGHyrZFIP EBOGj7uF+WbixqfR7oSyHqdPeKCx6nbJVK4KTR92+S5jg1BqnbM1wd+UFbPNc6mZAPOv 1b/iHoQftrpi6UHg8nBvQAJoxcvuJSZCrBS2nXgYKIKTWjWdQ9Omf6A6LzcaP0RzepmL zB8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references :gmane-reply-to-list:date:in-reply-to:message-id:mime-version :content-transfer-encoding; bh=0KOqyTaVwuOLFBWozgCuFiJI1QIQAuE8yuj46hiabcw=; b=7EMpnPjj8NSN3WD3bnMeH6uiahc6caO6xJwDCorqKL5FHCkYzor2jIzzLnKWDG7ivk nGyK92zl9k8QnUgLbwH+ztlgOniHMJ86EKiXF4z6S3LYZoMDJff2Pha4GMrBgg/w1MiJ +4zP9G471FhQMNjmEBuX3R+hC9gH8xCwnxzVxvyOoUQf9ncn0zX+U88CuWpH1UFOGliv kT6wJKZmx1Zj8F0VaRs72Z7yR0MVs2Mw8OkxbKXDXoxBSSrE1D7LJWJnPYsbJN31PLOX TeZS+LB1QhgzU3gPWFyZxMpBPOh+oWwGlgDir7fVa/Pv+slKOtE/YE8XzIpdvguiv/tc LrXg== X-Gm-Message-State: AOAM532w8BOD0dnUt+5g3YV6/THkQ5bQ+r9ObkpXQWOoApISDQMvTeEP xqXtNn7ovPO19nsiApQbUMW0ktSabCM= X-Google-Smtp-Source: ABdhPJxsIDt+mLS7ZsgSgfVxWJet3UqL6Qwi2RUVz/ICFELPSU2yayKFk2KibCnYw/2P4NN7nRZ/pw== X-Received: by 2002:a5d:648a:0:b0:217:3552:eb2d with SMTP id o10-20020a5d648a000000b002173552eb2dmr42717670wri.78.1655107763627; Mon, 13 Jun 2022 01:09:23 -0700 (PDT) Original-Received: from rltb ([2a01:e0a:3f3:fb50:3aa2:ff8f:2f22:f580]) by smtp.gmail.com with ESMTPSA id z12-20020a5d44cc000000b00219e758ff4fsm7768892wrr.59.2022.06.13.01.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 01:09:22 -0700 (PDT) Gmane-Reply-To-List: yes In-Reply-To: <87mtehxgm2.fsf@gnu.org> (Tassilo Horn's message of "Mon, 13 Jun 2022 07:21:00 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=rpluim@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:137777 Archived-At: >>>>> On Mon, 13 Jun 2022 07:21:00 +0200, Tassilo Horn said: Tassilo> "emacsclient " exits on `server-edit' (C-x #) (or goes t= o the next Tassilo> buffer if more than one file were specified on the command lin= e) but Tassilo> won't make emacs itself exit. So there is an exit code for em= acsclient Tassilo> but it seem one cannot influence it. There=CA=BCs `server-edit-abort', but that doesn=CA=BCt (currently) allow y= ou to tell emacsclient which exit code to use. I guess it could be extended. >>> 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". Robert --=20