2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>

	* viper-cmd.el (viper-special-read-and-insert-char): use
	read-key-sequence.
	(viper-after-change-undo-hook): enhancements.
	(viper-after-change-undo-hook): new hook.
	(viper-undo): use viper-after-change-undo-hook.
	(viper-add-newline-at-eob-if-necessary): widen before making changes.
	(viper-next-line-at-bol): If point is on a widget or a button, simulate
	clicking on that widget/button.

	* viper.el (viper-mode): allow for a separate cursor color in Emacs
	state.

	* ediff-diff (ediff-test-patch-utility): catch errors.
	(ediff-actual-diff-options, ediff-actual-diff3-options): new variables.
	(ediff-set-actual-diff-options): new function.
	(ediff-reset-diff-options, ediff-toggle-ignore-case):
	use ediff-set-actual-diff-options.
	(ediff-extract-diffs): catch errors.
	(ediff-whitespace): add nonbreakable space.
	(ediff-same-file-contents): catch errors.

	* ediff-mult.el (ediff-collect-custom-diffs): save
	coding-system-for-read.

	* ediff-vers.el (ediff-keep-tmp-versions): new var.
	(ediff-vc-internal, ediff-vc-merge-internal): use
	ediff-delete-version-file.
	(ediff-delete-version-file): new function.

	* ediff-wind.el (ediff-control-frame-parameters): set frame fringes.

	* ediff.el (ediff-directories, ediff-directory-revisions,
	ediff-merge-directories, ediff-merge-directories-with-ancestor,
	ediff-directories-internal, ediff-merge-directory-revisions,
	ediff-merge-directory-revisions-with-ancestor,
	ediff-directories3): use read-directory-name.

1 files changed, 20 insertions, 16 deletions

diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 0bbd3298c7a..71859a5d4c5 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1656,22 +1656,26 @@ This operation is defined only for `ediff-directories' and
 multifile patches.  For `ediff-directory-revisions', we insist that
 all marked sessions must be active."
   (interactive)
-  (or (ediff-buffer-live-p ediff-meta-diff-buffer)
-      (setq ediff-meta-diff-buffer
-            (get-buffer-create
-             (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
-  (ediff-with-current-buffer ediff-meta-diff-buffer
-    (setq buffer-read-only nil)
-    (erase-buffer))
-  (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
-      ;; did something
-      (progn
-        (display-buffer ediff-meta-diff-buffer 'not-this-window)
-        (ediff-with-current-buffer ediff-meta-diff-buffer
-          (set-buffer-modified-p nil)
-          (setq buffer-read-only t)))
-    (beep)
-    (message "No marked sessions found")))
+  (let ((coding-system-for-read ediff-coding-system-for-read))
+    (or (ediff-buffer-live-p ediff-meta-diff-buffer)
+        (setq ediff-meta-diff-buffer
+              (get-buffer-create
+               (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
+    (ediff-with-current-buffer ediff-meta-diff-buffer
+                               (setq buffer-read-only nil)
+                               (erase-buffer))
+    (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
+        ;; did something
+        (progn
+          (display-buffer ediff-meta-diff-buffer 'not-this-window)
+          (ediff-with-current-buffer ediff-meta-diff-buffer
+                                     (set-buffer-modified-p nil)
+                                     (setq buffer-read-only t))
+          (if (fboundp 'diff-mode)
+              (with-current-buffer ediff-meta-diff-buffer
+                (diff-mode))))
+      (beep)
+      (message "No marked sessions found"))))
 
 (defun ediff-meta-show-patch ()
   "Show the multi-file patch associated with this group session."