[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

[Stefan Monnier]

Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.16 emacs/lisp/smerge-mode.el:1.17
*** emacs/lisp/smerge-mode.el:1.16      Wed Aug 14 20:24:56 2002
--- emacs/lisp/smerge-mode.el   Mon Sep  2 21:20:20 2002
***************
*** 4,10 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.16 2002/08/15 00:24:56 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.17 2002/09/03 01:20:20 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 54,60 ****
    :group 'tools
    :prefix "smerge-")
  
! (defcustom smerge-diff-buffer-name "*smerge-diff*"
    "Buffer name to use for displaying diffs."
    :group 'smerge
    :type '(choice
--- 54,60 ----
    :group 'tools
    :prefix "smerge-")
  
! (defcustom smerge-diff-buffer-name "*vc-diff*"
    "Buffer name to use for displaying diffs."
    :group 'smerge
    :type '(choice
***************
*** 183,191 ****
  ;; Compiler pacifiers
  (defvar font-lock-mode)
  (defvar font-lock-keywords)
- (eval-when-compile
-   (unless (fboundp 'font-lock-fontify-region)
-     (autoload 'font-lock-fontify-region "font-lock")))
  
  ;;;;
  ;;;; Actual code
--- 183,188 ----
***************
*** 218,223 ****
--- 215,253 ----
                 t t)
    (smerge-auto-leave))
  
+ (defun smerge-combine-with-next ()
+   "Combine the current conflict with the next one."
+   (interactive)
+   (smerge-match-conflict)
+   (let ((ends nil))
+     (dolist (i '(3 2 1 0))
+       (push (if (match-end i) (copy-marker (match-end i) t)) ends))
+     (setq ends (apply 'vector ends))
+     (goto-char (aref ends 0))
+     (if (not (re-search-forward smerge-begin-re nil t))
+       (error "No next conflict")
+       (smerge-match-conflict)
+       (let ((match-data (mapcar (lambda (m) (if m (copy-marker m)))
+                               (match-data))))
+       ;; First copy the in-between text in each alternative.
+       (dolist (i '(1 2 3))
+         (when (aref ends i)
+           (goto-char (aref ends i))
+           (insert-buffer-substring (current-buffer)
+                                    (aref ends 0) (car match-data))))
+       (delete-region (aref ends 0) (car match-data))
+       ;; Then move the second conflict's alternatives into the first.
+       (dolist (i '(1 2 3))
+         (set-match-data match-data)
+         (when (and (aref ends i) (match-end i))
+           (goto-char (aref ends i))
+           (insert-buffer-substring (current-buffer)
+                                    (match-beginning i) (match-end i))))
+       (delete-region (car match-data) (cadr match-data))
+       ;; Free the markers.
+       (dolist (m match-data) (if m (move-marker m nil)))
+       (mapc (lambda (m) (if m (move-marker m nil))) ends)))))
+ 
  (defun smerge-keep-base ()
    "Revert to the base version."
    (interactive)
***************
*** 360,392 ****
        (dir default-directory)
        (file (file-relative-name buffer-file-name))
        (coding-system-for-read buffer-file-coding-system))
!     (write-region beg1 end1 file1)
!     (write-region beg2 end2 file2)
      (unwind-protect
        (with-current-buffer (get-buffer-create smerge-diff-buffer-name)
          (setq default-directory dir)
          (let ((inhibit-read-only t))
            (erase-buffer)
!           (apply 'call-process diff-command nil t nil
!                  (append smerge-diff-switches
!                          (list "-L" (concat name1 "/" file)
!                                "-L" (concat name2 "/" file)
!                                file1 file2))))
          (goto-char (point-min))
          (diff-mode)
          (display-buffer (current-buffer) t))
        (delete-file file1)
        (delete-file file2))))
  
! (eval-when-compile
!   ;; compiler pacifiers
!   (defvar smerge-ediff-windows)
!   (defvar smerge-ediff-buf)
!   (defvar ediff-buffer-A)
!   (defvar ediff-buffer-B)
!   (defvar ediff-buffer-C)
!   (unless (fboundp 'ediff-cleanup-mess)
!     (autoload 'ediff-cleanup-mess "ediff-util")))
  
  (defun smerge-ediff ()
    "Invoke ediff to resolve the conflicts."
--- 390,421 ----
        (dir default-directory)
        (file (file-relative-name buffer-file-name))
        (coding-system-for-read buffer-file-coding-system))
!     (write-region beg1 end1 file1 nil 'nomessage)
!     (write-region beg2 end2 file2 nil 'nomessage)
      (unwind-protect
        (with-current-buffer (get-buffer-create smerge-diff-buffer-name)
          (setq default-directory dir)
          (let ((inhibit-read-only t))
            (erase-buffer)
!           (let ((status
!                  (apply 'call-process diff-command nil t nil
!                         (append smerge-diff-switches
!                                 (list "-L" (concat name1 "/" file)
!                                       "-L" (concat name2 "/" file)
!                                       file1 file2)))))
!             (if (eq status 0) (insert "No differences found.\n"))))
          (goto-char (point-min))
          (diff-mode)
          (display-buffer (current-buffer) t))
        (delete-file file1)
        (delete-file file2))))
  
! ;; compiler pacifiers
! (defvar smerge-ediff-windows)
! (defvar smerge-ediff-buf)
! (defvar ediff-buffer-A)
! (defvar ediff-buffer-B)
! (defvar ediff-buffer-C)
  
  (defun smerge-ediff ()
    "Invoke ediff to resolve the conflicts."