diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-11-16 04:55:45 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-11-16 04:55:45 +0000 |
| commit | 42acc58182959fd891b5f4263d900c088de24c13 (patch) | |
| tree | 8a8dccc528efba870afea719b5e73551be776d34 /lisp/ediff-util.el | |
| parent | 61c11870cc2f9e71e8c3608969b27afe323ce500 (diff) | |
| download | emacs-42acc58182959fd891b5f4263d900c088de24c13.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index c9de700f234..f6b62b0e0dd 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1294,12 +1294,14 @@ which see." ((eq ediff-window-setup-function 'ediff-setup-windows-plain) (if (ediff-in-control-buffer-p) (ediff-kill-bottom-toolbar)) - (if (ediff-buffer-live-p ediff-control-buffer) + (if (and (ediff-buffer-live-p ediff-control-buffer) + (window-live-p ediff-control-window)) (set-window-dedicated-p ediff-control-window nil)) (setq ediff-multiframe t) (setq window-setup-func 'ediff-setup-windows-multiframe)) (t - (if (ediff-buffer-live-p ediff-control-buffer) + (if (and (ediff-buffer-live-p ediff-control-buffer) + (window-live-p ediff-control-window)) (set-window-dedicated-p ediff-control-window nil)) (setq ediff-multiframe t) (setq window-setup-func 'ediff-setup-windows-multiframe)) @@ -1313,7 +1315,9 @@ which see." ediff-window-B nil))) ediff-session-registry) (if (ediff-in-control-buffer-p) - (ediff-recenter 'no-rehighlight)))) + (progn + (set-window-dedicated-p (selected-window) nil) + (ediff-recenter 'no-rehighlight))))) ;;;###autoload @@ -3312,7 +3316,8 @@ Without an argument, it saves customized diff argument, if available ediff-diff-buffer) (t (error "Output from `diff' not found")))) ) - (save-buffer))) + (let ((window-min-height 2)) + (save-buffer)))) ;; idea suggested by Hannu Koivisto <azure@iki.fi> |