From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful Date: Sat, 23 Nov 2013 07:23:09 +0100 Message-ID: <87li0focvm.fsf@fencepost.gnu.org> References: <87zjowpn2s.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385187802 23357 80.91.229.3 (23 Nov 2013 06:23:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 23 Nov 2013 06:23:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 23 07:23:28 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Vk6cq-0008Ky-Ep for ged-emacs-devel@m.gmane.org; Sat, 23 Nov 2013 07:23:28 +0100 Original-Received: from localhost ([::1]:42539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vk6cp-00082G-Mw for ged-emacs-devel@m.gmane.org; Sat, 23 Nov 2013 01:23:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vk6cm-00082B-SX for emacs-devel@gnu.org; Sat, 23 Nov 2013 01:23:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vk6cl-0005O7-Uw for emacs-devel@gnu.org; Sat, 23 Nov 2013 01:23:24 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:43531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vk6cl-0005O3-SL for emacs-devel@gnu.org; Sat, 23 Nov 2013 01:23:23 -0500 Original-Received: from localhost ([127.0.0.1]:50707 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vk6cl-00064G-D9; Sat, 23 Nov 2013 01:23:23 -0500 Original-Received: by lola (Postfix, from userid 1000) id 72777E04C7; Sat, 23 Nov 2013 07:23:09 +0100 (CET) In-Reply-To: (Stefan Monnier's message of "Fri, 22 Nov 2013 20:42:41 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:165603 Archived-At: Stefan Monnier writes: > Sounds OK (i.e. patch welcome). Just be careful that diff3 markers > don't always come with useful "names". Sure. > Also mine/other is used as mnemonic for key-bindings, so the > terminology is "deeply" embedded in smerge-mode, Uh what? The keybindings use a, b, and c. The only connection to the buffers is via visual arrangement, not via "MINE" and "OTHER. -- David Kastrup