2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>

	* viper-init.el (viper-ESC-keyseq-timeout): Make it into a function
	instead of a variable.

	* viper-util.el (viper-fast-keysequence-p): Changed to use
	viper-ESC-keyseq-timeout as a function.
	(viper-get-saved-cursor-color-in-replace-mode): Use defun instead of
	defsubst.

	* viper-cmd.el: Let line-move-visual to nil when using next-line or
	previous-line.
	(viper-R-state-post-command-sentinel): Use defun instead of defsubst.

	* viper-keym.el (viper-ESC-key): Use (kbd "ESC").

	* ediff-util.el (ediff-toggle-multiframe): Check if control window is
	live.
	(ediff-save-buffer): Let window-min-height to 2.

	* ediff-wind.el (ediff-setup-windows-plain-compare): Avoid selecting
	the minibuffer.

1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 64018466508..e21817289ff 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -416,6 +416,10 @@ into icons, regardless of the window manager."
 	    ;; this lets us have local versions of ediff-split-window-function
 	    split-window-function ediff-split-window-function
 	    three-way-comparison ediff-3way-comparison-job))
+    ;; if in minibuffer go somewhere else
+    (if (save-match-data
+	  (string-match "\*Minibuf-" (buffer-name (window-buffer))))
+	(select-window (next-window nil 'ignore-minibuf)))
     (delete-other-windows)
     (set-window-dedicated-p (selected-window) nil)
     (split-window-vertically)