From: Dave Love <fx@gnu.org>
Date: Wed, 8 Nov 2000 18:04:14 +0000 (+0000)
Subject: (ediff-control-frame-parameters): Zero
X-Git-Tag: emacs-pretest-21.0.90~208
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fc794f13b3c1538fcdf157de9a3f3384de726956;p=emacs.git

(ediff-control-frame-parameters): Zero
tool-bar-lines.
---

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 4e8138a087b..82415d94eba 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -151,6 +151,7 @@ In this case, Ediff will use those frames to display these buffers."
    '(vertical-scroll-bars . nil)  ; Emacs only
    '(scrollbar-width . 0)         ; XEmacs only
    '(menu-bar-lines . 0)          ; Emacs only
+   '(tool-bar-lines . 0)      ; Emacs 21+ only
    ;; don't lower and auto-raise
    '(auto-lower . nil)
    '(auto-raise . t)