emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debbugs-tracker] bug#34420: closed ([PATCH 2/2] smerge-mode: new functi


From: GNU bug Tracking System
Subject: [debbugs-tracker] bug#34420: closed ([PATCH 2/2] smerge-mode: new function to go to next conflict)
Date: Mon, 18 Feb 2019 23:29:01 +0000

Your message dated Mon, 18 Feb 2019 18:28:33 -0500
with message-id <address@hidden>
and subject line Re: bug#34420: [PATCH 2/2] smerge-mode: new function to go to 
next conflict
has caused the debbugs.gnu.org bug report #34420,
regarding [PATCH 2/2] smerge-mode: new function to go to next conflict
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
34420: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=34420
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: [PATCH 2/2] smerge-mode: new function to go to next conflict Date: Mon, 11 Feb 2019 00:14:53 +0300
* lisp/vc/smerge-mode.el (smerge-vc-next-conflict)
---
 lisp/vc/smerge-mode.el | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 929cd85432a..8ac0b3ed370 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1435,6 +1435,18 @@ smerge-start-session
         (smerge-next))
     (error (smerge-auto-leave))))
 
+(require 'vc)
+
+(defun smerge-vc-next-conflict ()
+  (interactive)
+  (let ((buffer (current-buffer)))
+    (when (not (smerge-goto-next-conflict))
+      (vc-find-conflicted-file)
+      (if (eq buffer (current-buffer))
+          (message "No conflicts found")
+        (goto-char 0)
+        (smerge-goto-next-conflict)))))
+
 (provide 'smerge-mode)
 
 ;;; smerge-mode.el ends here
-- 
2.20.1




--- End Message ---
--- Begin Message --- Subject: Re: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict Date: Mon, 18 Feb 2019 18:28:33 -0500 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)
> Ah, works for me, thanks! I didn't want to upgrade to latest master because
> I've been using harfbuzz branch, but I just installed and tested master —
> everything is okay.

Thanks, closing,


        Stefan


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]