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

[Miles Bader]

Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.21.6.1 emacs/lisp/smerge-mode.el:1.21.6.2
*** emacs/lisp/smerge-mode.el:1.21.6.1  Fri Apr 16 12:50:09 2004
--- emacs/lisp/smerge-mode.el   Mon Jun 28 07:28:46 2004
***************
*** 65,71 ****
  (defcustom smerge-diff-switches
    (append '("-d" "-b")
          (if (listp diff-switches) diff-switches (list diff-switches)))
!   "*A list of strings specifying switches to be be passed to diff.
  Used in `smerge-diff-base-mine' and related functions."
    :group 'smerge
    :type '(repeat string))
--- 65,71 ----
  (defcustom smerge-diff-switches
    (append '("-d" "-b")
          (if (listp diff-switches) diff-switches (list diff-switches)))
!   "*A list of strings specifying switches to be passed to diff.
  Used in `smerge-diff-base-mine' and related functions."
    :group 'smerge
    :type '(repeat string))
***************
*** 324,330 ****
              ;; Out of range
              (popup-menu smerge-mode-menu)
            ;; Install overlay.
!           (setq o (make-overlay (match-beginning i) (match-end i)))  
            (unwind-protect
                (progn
                  (overlay-put o 'face 'highlight)
--- 324,330 ----
              ;; Out of range
              (popup-menu smerge-mode-menu)
            ;; Install overlay.
!           (setq o (make-overlay (match-beginning i) (match-end i)))
            (unwind-protect
                (progn
                  (overlay-put o 'face 'highlight)
***************
*** 477,482 ****
--- 477,489 ----
  
          ;; handle the various conflict styles
          (cond
+          ((save-excursion
+             (goto-char mine-start)
+             (re-search-forward smerge-begin-re end t))
+           ;; There's a nested conflict and we're after the the beginning
+           ;; of the outer one but before the beginning of the inner one.
+           (error "There is a nested conflict"))
+ 
           ((re-search-backward smerge-base-re start t)
            ;; a 3-parts conflict
            (set (make-local-variable 'smerge-conflict-style) 'diff3-A)
***************
*** 505,511 ****
            (unwind-protect
                (add-text-properties start end smerge-text-properties)
              (restore-buffer-modified-p m)))
!               
          (store-match-data (list start end
                                  mine-start mine-end
                                  base-start base-end
--- 512,518 ----
            (unwind-protect
                (add-text-properties start end smerge-text-properties)
              (restore-buffer-modified-p m)))
! 
          (store-match-data (list start end
                                  mine-start mine-end
                                  base-start base-end
***************
*** 521,529 ****
  Returns non-nil if a match is found between the point and LIMIT.
  The point is moved to the end of the conflict."
    (when (re-search-forward smerge-begin-re limit t)
!     (ignore-errors
!       (smerge-match-conflict)
!       (goto-char (match-end 0)))))
  
  (defun smerge-diff (n1 n2)
    (smerge-match-conflict)
--- 528,538 ----
  Returns non-nil if a match is found between the point and LIMIT.
  The point is moved to the end of the conflict."
    (when (re-search-forward smerge-begin-re limit t)
!     (condition-case err
!       (progn
!         (smerge-match-conflict)
!         (goto-char (match-end 0)))
!       (error (smerge-find-conflict limit)))))
  
  (defun smerge-diff (n1 n2)
    (smerge-match-conflict)
***************
*** 673,677 ****
  
  (provide 'smerge-mode)
  
! ;;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
  ;;; smerge-mode.el ends here
--- 682,686 ----
  
  (provide 'smerge-mode)
  
! ;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
  ;;; smerge-mode.el ends here