--- a/lisp/ediff/ediff-wind.el	Mon Aug 13 08:47:56 2007 +0200
+++ b/lisp/ediff/ediff-wind.el	Mon Aug 13 08:48:16 2007 +0200
@@ -24,6 +24,9 @@
 ;;; Code:
 
 (require 'ediff-init)
+;;(if ediff-xemacs-p
+;;    (nil) (require 'ediff-tbar)
+(defun ediff-compute-toolbar-width () 0)
 
 ;; Compiler pacifier
 (defvar icon-title-format)
@@ -853,7 +856,8 @@
     ;; 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 (max (+ (ediff-help-message-line-length) 2)
+		      (ediff-compute-toolbar-width))
 	  adjusted-parameters (append (list
 				       ;; possibly change surrogate minibuffer
 				       (cons 'minibuffer
@@ -876,9 +880,6 @@
 	  (set-specifier bottom-toolbar-height (list ctl-frame 0))
 	  (set-specifier left-toolbar-width (list ctl-frame 0))
 	  (set-specifier right-toolbar-width (list ctl-frame 0))
-	  ;; XEmacs needed a redisplay, as it had trouble setting
-	  ;; height correctly otherwise.
-	  ;;(sit-for 0)
 	  ))
     
     ;; Under OS/2 (emx) we have to call modify frame parameters twice, in order
@@ -893,7 +894,8 @@
     
     (modify-frame-parameters ctl-frame adjusted-parameters)
     (make-frame-visible ctl-frame)
-    
+    (ediff-make-bottom-toolbar) ; no effect if the toolbar is not requested
+
     ;; This works around a bug in 19.25 and earlier. There, if frame gets
     ;; iconified, the current buffer changes to that of the frame that
     ;; becomes exposed as a result of this iconification.
@@ -1061,7 +1063,7 @@
     (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)
@@ -1189,7 +1191,7 @@
 	    (or (not ediff-3way-job)
 		(eq (window-buffer C-wind) ediff-buffer-C))
 	    (string= ediff-window-config-saved
-		     (format "\%S\%S\%S\%S\%S\%S\%S"
+		     (format "%S%S%S%S%S%S%S"
 			     ctl-wind A-wind B-wind C-wind
 			     ediff-split-window-function
 			     (ediff-multiframe-setup-p)
@@ -1199,6 +1201,7 @@
 ;;; 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)