From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Regarding smerge upper/lower; needs NEWS Date: Thu, 13 Apr 2017 14:32:37 -0400 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1492108374 2263 195.159.176.226 (13 Apr 2017 18:32:54 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 13 Apr 2017 18:32:54 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 13 20:32:50 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyjY2-0000SC-4b for ged-emacs-devel@m.gmane.org; Thu, 13 Apr 2017 20:32:50 +0200 Original-Received: from localhost ([::1]:50378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyjY8-0001SD-2a for ged-emacs-devel@m.gmane.org; Thu, 13 Apr 2017 14:32:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyjY1-0001S6-Pr for emacs-devel@gnu.org; Thu, 13 Apr 2017 14:32:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyjXw-0001P4-QC for emacs-devel@gnu.org; Thu, 13 Apr 2017 14:32:49 -0400 Original-Received: from [195.159.176.226] (port=49990 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cyjXw-0001Ns-Ku for emacs-devel@gnu.org; Thu, 13 Apr 2017 14:32:44 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1cyjXo-00009I-B5 for emacs-devel@gnu.org; Thu, 13 Apr 2017 20:32:36 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 25 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:owIxlxFRqR9+qvUsw53d0VUrt+c= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:213943 Archived-At: > @@ -1247,12 +1247,12 @@ smerge-ediff > (upper (generate-new-buffer > (or name-upper > (concat "*" filename " " > - (smerge--get-marker smerge-begin-re "UPPER") > + (smerge--get-marker smerge-begin-re "A") > "*")))) > (lower (generate-new-buffer > (or name-lower > (concat "*" filename " " > - (smerge--get-marker smerge-end-re "LOWER") > + (smerge--get-marker smerge-end-re "B") > "*")))) > base) > (with-current-buffer upper Let's not forget that smerge works not only for 2-part conflicts but also for 3-part conflicts (which I think are immensely more valuable), where the middle one is the "ancestor". Currently, the names are "upper/base/lower", which I find tolerable, but I'm not sure "a/base/b" is good enough. Stefan