2005-10-05 Michael Kifer <[email protected]>

	* ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.
	(ediff-merge-region-is-non-clash-to-skip): previouslu called
	ediff-merge-region-is-non-clash.

	* ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use
	insert-buffer-substring.

	* ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for
	selecting files to patch. Also bug fixes.

	* ediff-util.el (ediff-setup): bug fix.
	(ediff-next-difference): Never skip clashes that differ in white space
	only.

	* ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame):
	check the menubar feature.

	* viper-cmd.el (viper-normalize-minor-mode-map-alist,
	viper-refresh-mode-line): use make-local-variable to localize some vars
	instead of make-variable-buffer-local. Suggested by Stefan Monnier.

	* viper-init.el (viper-make-variable-buffer-local): delete alias.
	(viper-restore-cursor-type,viper-set-insert-cursor-type): use
	make-local-variable instead of make-variable-buffer-local. Suggested by
	Stefan Monnier.

	* viper.el (viper-mode): don't use viper-make-variable-buffer-local.
	(viper-comint-mode-hook): use make-local-variable on
	require-final-newline.
	(viper-non-hook-settings): don't use make-variable-buffer-local.

1 files changed, 7 insertions, 5 deletions

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 9ab24ce5f6..41f294c1b1 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -329,7 +329,7 @@ to invocation.")
 	    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.
+      ;; This is because one may loose work---dangerous.
       (if (string-match "buffer" (symbol-name ediff-job-name))
 	  (setq ediff-keep-variants t))
 
@@ -368,6 +368,7 @@ to invocation.")
 	    (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,7 +1730,7 @@ With a prefix argument, go forward that many differences."
 	(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)
+	    (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,6 +1745,7 @@ With a prefix argument, go forward that many differences."
 		     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,7 +1756,7 @@ With a prefix argument, go forward that many differences."
 	  (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)
+	      (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,7 +1780,7 @@ With a prefix argument, go back that many differences."
 	(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)
+	    (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,7 +1804,7 @@ With a prefix argument, go back that many differences."
 	  (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)
+	      (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))