summaryrefslogtreecommitdiff
path: root/lisp/ediff-wind.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>1996-09-20 01:10:05 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>1996-09-20 01:10:05 +0000
commita013cdbb1e43acf8ca017fe2baf4bfe84c812492 (patch)
treef13671364d74f93110bff267ee5df4067b44d9bb /lisp/ediff-wind.el
parentc1afbab1edcbced1a853ef0b8f5ae9940ca26db5 (diff)
downloademacs-a013cdbb1e43acf8ca017fe2baf4bfe84c812492.tar.gz
*** empty log message ***
Diffstat (limited to 'lisp/ediff-wind.el')
-rw-r--r--lisp/ediff-wind.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index f4033cf5b85..58cae39a191 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -853,7 +853,7 @@ into icons, regardless of the window manager.")
;; 1 more line for the modeline
(setq lines (1+ (count-lines (point-min) (point-max)))
fheight lines
- fwidth (+ (ediff-help-message-line-length) 2)
+ fwidth (+ (ediff-help-message-line-length) 1)
adjusted-parameters (append (list
;; possibly change surrogate minibuffer
(cons 'minibuffer
@@ -1061,7 +1061,7 @@ It assumes that it is called from within the control buffer."
(setq mode-line-format
(list (if (ediff-narrow-control-frame-p) " " "-- ")
mode-line-buffer-identification
- " Quick Help"))
+ " Quick Help"))
;; control buffer id
(setq mode-line-buffer-identification
(if (ediff-narrow-control-frame-p)
@@ -1199,6 +1199,7 @@ It assumes that it is called from within the control buffer."
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
+;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
;;; End:
(provide 'ediff-wind)