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: Sun, 12 Jun 2022 13:31:43 +0200 Message-ID: <87a6ai15k0.fsf@gmail.com> References: <87ilpaay1j.fsf@gnu.org> <87mtelpq9t.fsf@web.de> <875yl8qx6t.fsf@gnu.org> <8735gcmjxq.fsf@web.de> 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="26252"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Tassilo Horn , help-gnu-emacs@gnu.org To: Michael Heerdegen Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jun 12 13:32:59 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 1o0Lpy-0006jd-Ff for geh-help-gnu-emacs@m.gmane-mx.org; Sun, 12 Jun 2022 13:32:58 +0200 Original-Received: from localhost ([::1]:51524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0Lpx-0000Sh-7U for geh-help-gnu-emacs@m.gmane-mx.org; Sun, 12 Jun 2022 07:32:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0Los-0000SX-B9 for help-gnu-emacs@gnu.org; Sun, 12 Jun 2022 07:31:50 -0400 Original-Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:46463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0Loq-0002aj-LM; Sun, 12 Jun 2022 07:31:49 -0400 Original-Received: by mail-wm1-x336.google.com with SMTP id r123-20020a1c2b81000000b0039c1439c33cso1694481wmr.5; Sun, 12 Jun 2022 04:31:47 -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=H0SdFFtIw0JwXJ+CwSai1b93PCflHL+hWVx7BVEGZ7U=; b=GnZ689PdRxdCpoEXQFSL8Mte45bllDcGyjd81Aq0EnhQCGeHzGaBiVBsrP10XeteC/ zKNwmFfLMHtqOKTdaqYadTQnHi1ISgggd1cFUxmTaDJWtNLRJCtC/PMDpy/w4oCUmjtK sky0ZtjrP79cL5w7eaNOxOK1WuXuos3yd8wM23+3O2LEGmquHUE3zcDnhvZed07YBm7H inf55tYeBV3bH2OR2r0vnVOptNJjwd3HdMQ7gQv6aYO+T+Til0Mu8A1zQ6JxR8+1w0mx Upy8CWSEjIlkNaehLtMThIb/ry8CkybaoTl5XIAE1hVJVdTMr4Tu2v8GEfFCuVocyoVO 0qUA== 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=H0SdFFtIw0JwXJ+CwSai1b93PCflHL+hWVx7BVEGZ7U=; b=cEdLOuOxJQs/XG45v15DiBJzfNhSGFt4T4uB82jQ75Y+PTzxOcgICp43m5cUFdYjFb P4W8aAiVCuTbjJZdTt1EcYgUU3wBS9W+SjXKoq4G2z9lHybop9VP1j2pVIUFJIRpSQ55 cdZwKig/YfBVsnJauPP4m/uul0XCNjkbUORX/ms3Sq/iNAxL9VJigTuFm5jsu7ggRJ3t zn95szdgMozw5ze3nOeroo3/RZ9hlcVVxELYrIT3bznJEe4z6xwwG9gZISMVjGW+ENzj kELP6siX0bhSqvDqajsDRwf19fwiZxi6wRN1SyzemUxhkQgLYzzuLddyn5KHddV26j/h Gw2g== X-Gm-Message-State: AOAM531rcYyIW9qjFq4oIKW0rjehRMtCAgiAXDTrdBqsi2zskPX9E2uq ZcvMjHFCKTKjUvU8C+WlgrgIPbBZivc= X-Google-Smtp-Source: ABdhPJzTn6eqdpv1nYOZWEOENWdVUQ9s0HAyg6IN07rUqWyKXfmaZU1wirMDuXORyoFKYm0v+rXZvw== X-Received: by 2002:a05:600c:1991:b0:39c:88ba:2869 with SMTP id t17-20020a05600c199100b0039c88ba2869mr5007542wmq.14.1655033505460; Sun, 12 Jun 2022 04:31:45 -0700 (PDT) Original-Received: from rltb ([2a01:e0a:3f3:fb50:1481:bc84:7e2e:d22b]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c4fd300b0039c55bc2c97sm9804279wmq.16.2022.06.12.04.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 04:31:44 -0700 (PDT) Gmane-Reply-To-List: yes In-Reply-To: <8735gcmjxq.fsf@web.de> (Michael Heerdegen's message of "Fri, 10 Jun 2022 20:50:57 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=rpluim@gmail.com; helo=mail-wm1-x336.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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:137741 Archived-At: >>>>> On Fri, 10 Jun 2022 20:50:57 +0200, Michael Heerdegen said: Michael> Tassilo Horn writes: >> Thanks, I will have a look. Do I understand it correctly that your >> answer is specifically about the emacsclient case? Michael> Yes. >> But how do I print buffer contents to emacs' stdout? Michael> I don't know. With any of the methods to run emacs non-interactively, eg emacs -Q --script FILE any calls to `message' in FILE will go to stdout, so (with-current-buffer "mybuffer" (message "%s" (buffer-string))) should do. If you=CA=BCre using emacsclient, you can write to std*err* using `external-debugging-output': (print "My interesting contents" #'external-debugging-output) Robert --=20