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 15:07:03 +0100 Message-ID: <87a9gvnreg.fsf@fencepost.gnu.org> References: <87zjowpn2s.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1385215640 24674 80.91.229.3 (23 Nov 2013 14:07:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 23 Nov 2013 14:07:20 +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 15:07:26 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 1VkDrp-0002rI-Rc for ged-emacs-devel@m.gmane.org; Sat, 23 Nov 2013 15:07:26 +0100 Original-Received: from localhost ([::1]:43803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkDrp-0000G9-DM for ged-emacs-devel@m.gmane.org; Sat, 23 Nov 2013 09:07:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkDrl-0000FA-Sg for emacs-devel@gnu.org; Sat, 23 Nov 2013 09:07:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VkDrk-0006wN-7h for emacs-devel@gnu.org; Sat, 23 Nov 2013 09:07:21 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkDrk-0006wJ-3k for emacs-devel@gnu.org; Sat, 23 Nov 2013 09:07:20 -0500 Original-Received: from localhost ([127.0.0.1]:59291 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkDrj-0000SK-Ji; Sat, 23 Nov 2013 09:07:19 -0500 Original-Received: by lola (Postfix, from userid 1000) id 21B53E04C7; Sat, 23 Nov 2013 15:07:03 +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:165619 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Let-smerge-mode-choose-default-buffer-names-based-on.patch >From 05ca072a856d0121422228ec3688a240194d8784 Mon Sep 17 00:00:00 2001 From: David Kastrup 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 + + * 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 (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 --=-=-= Content-Type: text/plain -- David Kastrup --=-=-=--