summaryrefslogtreecommitdiff
path: root/lisp/ediff-wind.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-wind.el')
-rw-r--r--lisp/ediff-wind.el1
1 files changed, 1 insertions, 0 deletions
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)