From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Regarding smerge upper/lower; needs NEWS Date: Wed, 12 Apr 2017 20:49:34 -0400 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1492044587 12610 195.159.176.226 (13 Apr 2017 00:49:47 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 13 Apr 2017 00:49:47 +0000 (UTC) Cc: Glenn Morris , Kaushal Modi , Emacs developers To: Richard Copley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 13 02:49:43 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 1cySxD-0003Aw-3t for ged-emacs-devel@m.gmane.org; Thu, 13 Apr 2017 02:49:43 +0200 Original-Received: from localhost ([::1]:46772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cySxJ-0007TW-0E for ged-emacs-devel@m.gmane.org; Wed, 12 Apr 2017 20:49:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cySx8-0007SH-HS for emacs-devel@gnu.org; Wed, 12 Apr 2017 20:49:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cySx7-00044b-E6 for emacs-devel@gnu.org; Wed, 12 Apr 2017 20:49:38 -0400 Original-Received: from mail-oi0-x233.google.com ([2607:f8b0:4003:c06::233]:33442) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cySx5-00044L-TW; Wed, 12 Apr 2017 20:49:35 -0400 Original-Received: by mail-oi0-x233.google.com with SMTP id b187so50500343oif.0; Wed, 12 Apr 2017 17:49:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=ybc1eGCTOPsi6hlh/HAsY2SLNOnLSeqz9dNY4uCs80Y=; b=KNnTA6P9xsCQKW3o3+gCA5PfbYpwmWP8Y36Xn+Nk7a21BxXEWtt/eIeC9G12HzBQ6d zw/JrnNv30+HtcRrX+rGgEAwE3b+PgkbTzEGuPo2qrzrxmUxf370w65sEhWgr8T77p+W SL0guvr3HEefUUKElbZBvgEnIl/ZPOPX2deoGZiEO6U4vGsOD8EIDo/wiGbXYQ7REsRz knqGNc6LLoBKyw8njVj1Izktq0Ra/44/t5G/qa6zkmj6z/RLtNJCQuoUzIAPSrjYQlMX 7/w3gIqW8dJtnOkrNTY16q/XwgZzZHaju8pwnisoL+sPn1bVVVV/ZkNTwe9tCY+iSZ8h XHFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=ybc1eGCTOPsi6hlh/HAsY2SLNOnLSeqz9dNY4uCs80Y=; b=nlKyqZm7iJ1oxU7/SxAfv2llVH15nnufZQjnj10yV/pCBpJwhKhNqIXBiG0s3UTfcJ 7ZP/Ou8uXv9x0rbhhFaCrhHBidFPtDClg9f1IyNfE5eKV2ld4qKPF40R430wHb3IQ2FS YI0Y+GTCNbObuHZZjqsXebfuTspxnYeSkMj2F6Bx6krgcx7ZErAwc5+ddi37Y8m0R1PB 4jJy/O2HjH9L0NPTI3PUf3G6XsZYVsvbJq3bqXxuhRsLYQ5wjFg/pLLePLihHNxNcg2y R75AZ9MYNI8nTKBjJAnfG/886GWWOjWGfDYkAoEsM7RPwd1HcA07shHo97a++8nM1fbK eTYw== X-Gm-Message-State: AN3rC/6WG0pzbW6iaXnP4yoqKKBMy8TSd+hK0ZFKDUpzLXr/o3olya+t 9avvzQTpc7G79UkVtVhiwFLN1/W8aHr5 X-Received: by 10.202.88.212 with SMTP id m203mr203578oib.127.1492044575123; Wed, 12 Apr 2017 17:49:35 -0700 (PDT) Original-Received: by 10.157.9.178 with HTTP; Wed, 12 Apr 2017 17:49:34 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: P9IN8xMq3Ekfd6RLvEfpVe_gOXw X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::233 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:213922 Archived-At: On Fri, Apr 7, 2017 at 3:53 PM, Richard Copley wrote: > > Sorry again, I didn't mean to be mysterious. Think of me as just a > stupid user. (I am just a stupid user.) > > Here's what happens, but please be sympathetic, because I haven't > taken the trouble to create an artificial merge conflict in order to > create an exact recipe. This is from memory and some of the details > are very likely wrong. > > I attempt an SVN merge which fails and leaves the file conflicted. > > I visit the resulting file, containing conflict markers, in Emacs. > > The buffer's in SMerge mode or something (I guess because of > magic-mode-alist but I didn't debug to check). > > Think: now I want to use Ediff (Ediff is why I use Emacs). How? > > C-h m > > Seems like it's something totally weird and impossible to remember. > ([C-x ^ e]? I really don't remember, I'd have to check.) > OK, yuck! But let's try it. > > Bang! UPPER on the left and LOWER on the right, with something else > entirely underneath. > > It's not exactly difficult to deal with, but it's distracting. Ah, I think I get it now. Does this help: --- i/lisp/vc/smerge-mode.el +++ w/lisp/vc/smerge-mode.el @@ -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