Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful

[David Kastrup <dak@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Sounds OK (i.e. patch welcome).  Just be careful that diff3 markers
> don't always come with useful "names".  Also mine/other is used as
> mnemonic for key-bindings, so the terminology is "deeply" embedded in
> smerge-mode, so maybe we should use "MINE - HEAD" and "OTHER -
> 2c633c8... Issue 3656/2: disambiguate our own ::to_string from
> std::to_string" for the names.
>
> In any case, please make it a bug-report, so we have a number to
> track it.

At any rate, this is what I went with.  Feel free to take it; I have a
copyright assignment for Emacs on file.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Let-smerge-mode-choose-default-buffer-names-based-on.patch --]
[-- Type: text/x-diff, Size: 3074 bytes --]

From 05ca072a856d0121422228ec3688a240194d8784 Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Sat, 23 Nov 2013 14:53:05 +0100
Subject: [PATCH] Let smerge-mode choose default buffer names based on conflict
 markers

* vc/smerge-mode.el (smerge-ediff): Let smerge-mode choose
default buffer names based on the conflict markers when
available.
(smerge-get-marker): New function.
---
 lisp/ChangeLog         |  7 +++++++
 lisp/vc/smerge-mode.el | 24 +++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d2a754..c791fe2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-23  David Kastrup  <dak@gnu.org>
+
+	* vc/smerge-mode.el (smerge-ediff): Let smerge-mode choose
+	default buffer names based on the conflict markers when
+	available.
+	(smerge-get-marker): New function.
+
 2013-11-23  Ivan Shmakov  <ivan@siamics.net>  (tiny change)
 
 	* vc/diff-mode.el (diff-mode): Only allow diff-default-read-only
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 87336b6..63ddd13 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -243,8 +243,8 @@ Used in `smerge-diff-base-mine' and related functions."
   "Font lock patterns for `smerge-mode'.")
 
 (defconst smerge-begin-re "^<<<<<<< \\(.*\\)\n")
-(defconst smerge-end-re "^>>>>>>> .*\n")
-(defconst smerge-base-re "^||||||| .*\n")
+(defconst smerge-end-re "^>>>>>>> \\(.*\\)\n")
+(defconst smerge-base-re "^||||||| \\(.*\\)\n")
 (defconst smerge-other-re "^=======\n")
 
 (defvar smerge-conflict-style nil
@@ -1182,6 +1182,14 @@ repeating the command will highlight other two parts."
 (defvar ediff-quit-hook)
 (declare-function ediff-cleanup-mess "ediff-util" nil)
 
+(defun smerge-get-marker (regexp default)
+  (save-excursion
+    (goto-char (point-min))
+    (if (and (search-forward-regexp regexp nil t)
+	     (> (match-end 1) (match-beginning 1)))
+	(match-string-no-properties 1)
+      default)))
+
 ;;;###autoload
 (defun smerge-ediff (&optional name-mine name-other name-base)
   "Invoke ediff to resolve the conflicts.
@@ -1194,9 +1202,13 @@ buffer names."
 	 (config (current-window-configuration))
 	 (filename (file-name-nondirectory buffer-file-name))
 	 (mine (generate-new-buffer
-		(or name-mine (concat "*" filename " MINE*"))))
+		(or name-mine (concat "*" filename " "
+				      (smerge-get-marker smerge-begin-re "MINE")
+				      "*"))))
 	 (other (generate-new-buffer
-		 (or name-other (concat "*" filename " OTHER*"))))
+		 (or name-other (concat "*" filename " "
+					(smerge-get-marker smerge-end-re "OTHER")
+					"*"))))
 	 base)
     (with-current-buffer mine
       (buffer-disable-undo)
@@ -1221,7 +1233,9 @@ buffer names."
 
     (when base
       (setq base (generate-new-buffer
-		  (or name-base (concat "*" filename " BASE*"))))
+		  (or name-base (concat "*" filename " "
+					(smerge-get-marker smerge-base-re "BASE")
+					"*"))))
       (with-current-buffer base
 	(buffer-disable-undo)
 	(insert-buffer-substring buf)
-- 
1.8.3.2


[-- Attachment #3: Type: text/plain, Size: 20 bytes --]



-- 
David Kastrup