From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Emanuel Berg Newsgroups: gmane.emacs.help Subject: Re: How to use emacs as a "diff3 -m" compatible merge tool? Date: Sat, 11 Jun 2022 00:52:07 +0200 Message-ID: <87h74suo6g.fsf@dataswamp.org> 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="20886"; 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:LiLLL6KtES4zs+g4V21OV58MCPI= Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jun 11 00:52:45 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 1nznUi-0005Bi-GW for geh-help-gnu-emacs@m.gmane-mx.org; Sat, 11 Jun 2022 00:52:44 +0200 Original-Received: from localhost ([::1]:53784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nznUh-0004Oi-1a for geh-help-gnu-emacs@m.gmane-mx.org; Fri, 10 Jun 2022 18:52:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nznUJ-0004Oa-Lj for help-gnu-emacs@gnu.org; Fri, 10 Jun 2022 18:52:19 -0400 Original-Received: from ciao.gmane.io ([116.202.254.214]:49864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nznUH-0000y5-TL for help-gnu-emacs@gnu.org; Fri, 10 Jun 2022 18:52:19 -0400 Original-Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1nznUF-0004jO-U2 for help-gnu-emacs@gnu.org; Sat, 11 Jun 2022 00:52:15 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: help-gnu-emacs@gnu.org Mail-Copies-To: never 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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, 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:137636 Archived-At: Tassilo Horn wrote: > 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.) Why not, isn't this supposed to be a shell tool? If so, see emacs(1) as you know ... If not, and if it isn't supposed to be exited, how can there be an exit code to begin? (To end with, without ending anything.) > How do I print the merge buffer's contents to stdout? Here is some material on that but if you use Emacs as a shell tool you don't need it https://stackoverflow.com/a/41435631 -- underground experts united https://dataswamp.org/~incal