2002-10-27 Michael Kifer <kifer@cs.stonybrook.edu>

	* ediff-wind.el (ediff-control-frame-parameters): added scrollbar-height.

2 files changed, 5 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20c2f6df45c..2f2c7c012fe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-27  Michael Kifer  <kifer@cs.stonybrook.edu>
+        
+        * ediff-wind.el (ediff-control-frame-parameters): added scrollbar-height.
+        
 2002-10-27  Andreas Schwab  <schwab@suse.de>
 
         * progmodes/sh-script.el (sh-mode-syntax-table): Don't make ^L
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 723ae577767..9e959265390 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -155,6 +155,7 @@ In this case, Ediff will use those frames to display these buffers."
    '(user-position . t)       ; Emacs only
    '(vertical-scroll-bars . nil)  ; Emacs only
    '(scrollbar-width . 0)         ; XEmacs only
+   '(scrollbar-height . 0)        ; XEmacs only
    '(menu-bar-lines . 0)          ; Emacs only
    '(tool-bar-lines . 0)          ; Emacs 21+ only
    ;; don't lower but auto-raise