From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.help Subject: Re: How to use emacs as a "diff3 -m" compatible merge tool? Date: Thu, 09 Jun 2022 21:53:34 +0200 Message-ID: <87mtelpq9t.fsf@web.de> References: <87ilpaay1j.fsf@gnu.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="33940"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) To: help-gnu-emacs@gnu.org Cancel-Lock: sha1:WHPWF41fzkoDgQ8eBkFpeWarwUE= Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jun 09 21:56:26 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 1nzOGY-0008eO-FJ for geh-help-gnu-emacs@m.gmane-mx.org; Thu, 09 Jun 2022 21:56:26 +0200 Original-Received: from localhost ([::1]:48128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzOGX-0007or-9G for geh-help-gnu-emacs@m.gmane-mx.org; Thu, 09 Jun 2022 15:56:25 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzODx-0007mh-Cl for help-gnu-emacs@gnu.org; Thu, 09 Jun 2022 15:53:45 -0400 Original-Received: from ciao.gmane.io ([116.202.254.214]:44624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzODv-0002aa-Rz for help-gnu-emacs@gnu.org; Thu, 09 Jun 2022 15:53:45 -0400 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1nzODt-0005H7-GH for help-gnu-emacs@gnu.org; Thu, 09 Jun 2022 21:53:41 +0200 X-Injected-Via-Gmane: http://gmane.org/ Received-SPF: pass client-ip=116.202.254.214; envelope-from=geh-help-gnu-emacs@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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:137576 Archived-At: Tassilo Horn writes: > How do I print the merge buffer's contents to stdout? And how can I > influence the exit code? (I could do (kill-emacs my-exit-code) but > would be more happy if I could also use the merge command with > emacsclient where I obviously don't want to kill emacs.) Never did something like this before. I spent some time trying to understand the code in server.el however. Seems `server-send-string' can be used for this. Maybe search for the occurrences - e.g. in `server-edit-abort' (and the rest of server.el). The available "options" are explained in the doc of `server-process-filter' AFAIU. I think you are interested in those "accepted by the client" - especially -print and -error. Michael.