(smerge-auto-combine-max-separation): New var.

(smerge-auto-combine): New fun.

2 files changed, 28 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 927b3ce86aa..cfd106aca27 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * smerge-mode.el (smerge-auto-combine-max-separation): New var.
+        (smerge-auto-combine): New fun.
+
 2008-02-12  Juri Linkov  <juri@jurta.org>
 
         * startup.el (fancy-startup-screen, normal-splash-screen):
@@ -6,8 +11,8 @@
         * desktop.el (after-init-hook): Set inhibit-startup-screen to t
         after reading the desktop.
 
-        * progmodes/compile.el (compilation-auto-jump): Call
-        compile-goto-error only when compilation-auto-jump-to-first-error
+        * progmodes/compile.el (compilation-auto-jump):
+        Call compile-goto-error only when compilation-auto-jump-to-first-error
         is non-nil.
         (compilation-scroll-output): Replace :type 'boolean with a choice
         that has three options including a third option `first-error'.
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index f2a7a9caf9e..8a3f15bac44 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -297,6 +297,8 @@ Can be nil if the style is undecided, or else:
 
 (defun smerge-combine-with-next ()
   "Combine the current conflict with the next one."
+  ;; `smerge-auto-combine' relies on the finish position (at the beginning
+  ;; of the closing marker).
   (interactive)
   (smerge-match-conflict)
   (let ((ends nil))
@@ -328,6 +330,25 @@ Can be nil if the style is undecided, or else:
         (dolist (m match-data) (if m (move-marker m nil)))
         (mapc (lambda (m) (if m (move-marker m nil))) ends)))))
 
+(defvar smerge-auto-combine-max-separation 2
+  "Max number of lines between conflicts that should be combined.")
+
+(defun smerge-auto-combine ()
+  "Automatically combine conflicts that are near each other."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (while (smerge-find-conflict)
+      ;; 2 is 1 (default) + 1 (the begin markers).
+      (while (save-excursion
+               (smerge-find-conflict
+                (line-beginning-position
+                 (+ 2 smerge-auto-combine-max-separation))))
+        (forward-line -1)               ;Go back inside the conflict.
+        (smerge-combine-with-next)
+        (forward-line 1)                ;Move past the end of the conflict.
+        ))))
+
 (defvar smerge-resolve-function
   (lambda () (error "Don't know how to resolve"))
   "Mode-specific merge function.