[Emacs-diffs] Changes to emacs/lisp/ediff-util.el

[Michael Kifer]

Index: emacs/lisp/ediff-util.el
diff -c emacs/lisp/ediff-util.el:1.63 emacs/lisp/ediff-util.el:1.64
*** emacs/lisp/ediff-util.el:1.63       Sat Sep 24 23:26:28 2005
--- emacs/lisp/ediff-util.el    Thu Oct  6 00:09:48 2005
***************
*** 329,335 ****
            ediff-word-mode-job (ediff-word-mode-job))
  
        ;; Don't delete variants in case of ediff-buffer-* jobs without asking.
!       ;; This is because u may loose work---dangerous.
        (if (string-match "buffer" (symbol-name ediff-job-name))
          (setq ediff-keep-variants t))
  
--- 329,335 ----
            ediff-word-mode-job (ediff-word-mode-job))
  
        ;; Don't delete variants in case of ediff-buffer-* jobs without asking.
!       ;; This is because one may loose work---dangerous.
        (if (string-match "buffer" (symbol-name ediff-job-name))
          (setq ediff-keep-variants t))
  
***************
*** 368,373 ****
--- 368,374 ----
            (save-excursion
              (set-buffer buffer-C)
              (insert-buffer-substring buf)
+             (goto-char (point-min))
              (funcall (ediff-with-current-buffer buf major-mode))
              (widen) ; merge buffer is always widened
              (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
***************
*** 1729,1735 ****
        (or (>= n ediff-number-of-differences)
            (setq regexp-skip (funcall ediff-skip-diff-region-function n))
            ;; this won't exec if regexp-skip is t
!           (setq non-clash-skip (ediff-merge-region-is-non-clash n)
                  skip-changed
                  (ediff-skip-merge-region-if-changed-from-default-p n))
            (ediff-install-fine-diff-if-necessary n))
--- 1730,1736 ----
        (or (>= n ediff-number-of-differences)
            (setq regexp-skip (funcall ediff-skip-diff-region-function n))
            ;; this won't exec if regexp-skip is t
!           (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
                  skip-changed
                  (ediff-skip-merge-region-if-changed-from-default-p n))
            (ediff-install-fine-diff-if-necessary n))
***************
*** 1744,1749 ****
--- 1745,1751 ----
                     skip-changed
                     ;; skip difference regions that differ in white space
                     (and ediff-ignore-similar-regions
+                         (ediff-merge-region-is-non-clash n)
                          (or (eq (ediff-no-fine-diffs-p n) t)
                              (and (ediff-merge-job)
                                   (eq (ediff-no-fine-diffs-p n) 'C)))
***************
*** 1754,1760 ****
          (or (>= n ediff-number-of-differences)
              (setq regexp-skip (funcall ediff-skip-diff-region-function n))
              ;; this won't exec if regexp-skip is t
!             (setq non-clash-skip (ediff-merge-region-is-non-clash n)
                    skip-changed
                    (ediff-skip-merge-region-if-changed-from-default-p n))
              (ediff-install-fine-diff-if-necessary n))
--- 1756,1762 ----
          (or (>= n ediff-number-of-differences)
              (setq regexp-skip (funcall ediff-skip-diff-region-function n))
              ;; this won't exec if regexp-skip is t
!             (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
                    skip-changed
                    (ediff-skip-merge-region-if-changed-from-default-p n))
              (ediff-install-fine-diff-if-necessary n))
***************
*** 1778,1784 ****
        (or (< n 0)
            (setq regexp-skip (funcall ediff-skip-diff-region-function n))
            ;; this won't exec if regexp-skip is t
!           (setq non-clash-skip (ediff-merge-region-is-non-clash n)
                  skip-changed
                  (ediff-skip-merge-region-if-changed-from-default-p n))
            (ediff-install-fine-diff-if-necessary n))
--- 1780,1786 ----
        (or (< n 0)
            (setq regexp-skip (funcall ediff-skip-diff-region-function n))
            ;; this won't exec if regexp-skip is t
!           (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
                  skip-changed
                  (ediff-skip-merge-region-if-changed-from-default-p n))
            (ediff-install-fine-diff-if-necessary n))
***************
*** 1802,1808 ****
          (or (< n 0)
              (setq regexp-skip (funcall ediff-skip-diff-region-function n))
              ;; this won't exec if regexp-skip is t
!             (setq non-clash-skip (ediff-merge-region-is-non-clash n)
                    skip-changed
                    (ediff-skip-merge-region-if-changed-from-default-p n))
              (ediff-install-fine-diff-if-necessary n))
--- 1804,1810 ----
          (or (< n 0)
              (setq regexp-skip (funcall ediff-skip-diff-region-function n))
              ;; this won't exec if regexp-skip is t
!             (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n)
                    skip-changed
                    (ediff-skip-merge-region-if-changed-from-default-p n))
              (ediff-install-fine-diff-if-necessary n))