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: Mon, 13 Jun 2022 11:52:44 +0200 Message-ID: <874k0oopoz.fsf@web.de> 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: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3415"; 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:Ocbhy5ZZqQA7ZprnaMHN52Hy+wM= Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jun 13 11:53:25 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 1o0glA-0000mF-8s for geh-help-gnu-emacs@m.gmane-mx.org; Mon, 13 Jun 2022 11:53:24 +0200 Original-Received: from localhost ([::1]:41430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0gl8-0003o5-TB for geh-help-gnu-emacs@m.gmane-mx.org; Mon, 13 Jun 2022 05:53:22 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0gkg-0003nG-QA for help-gnu-emacs@gnu.org; Mon, 13 Jun 2022 05:52:54 -0400 Original-Received: from ciao.gmane.io ([116.202.254.214]:37780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0gkf-0002V4-CG for help-gnu-emacs@gnu.org; Mon, 13 Jun 2022 05:52:54 -0400 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1o0gkb-000AXX-Sv for help-gnu-emacs@gnu.org; Mon, 13 Jun 2022 11:52:49 +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:137781 Archived-At: Robert Pluim writes: > Thereʼs `server-edit-abort', but that doesnʼt (currently) allow you to > tell emacsclient which exit code to use. I guess it could be extended. That uses the `server-send-string' command I mentioned. I guess the exit code generation itself is done in the C sources. Michael.