=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-09-15 15:30:43 +0000
+++ lisp/ChangeLog	2010-09-16 18:08:37 +0000
@@ -1,3 +1,9 @@
+2010-09-16  Stephen Berman  <address@hidden>
+
+	* dframe.el (dframe-reposition-frame-emacs): Use tool-bar-pixel-width
+	in calculating new frame position.  Add more space between new and
+	parent on the left.
+
 2010-09-15  Stefan Monnier  <address@hidden>
 
 	* emacs-lisp/bytecomp.el (byte-compile-warning-types): New type

=== modified file 'lisp/dframe.el'
--- lisp/dframe.el	2010-01-13 08:35:10 +0000
+++ lisp/dframe.el	2010-09-16 17:01:33 +0000
@@ -430,7 +430,8 @@
   (unless (or (not window-system) (eq window-system 'pc))
     (let* ((pfx (dframe-frame-parameter parent-frame 'left))
 	   (pfy (dframe-frame-parameter parent-frame 'top))
-	   (pfw (frame-pixel-width parent-frame))
+	   (pfw (+ (tool-bar-pixel-width parent-frame)
+		   (frame-pixel-width parent-frame)))
 	   (pfh (frame-pixel-height parent-frame))
 	   (nfw (frame-pixel-width new-frame))
 	   (nfh (frame-pixel-height new-frame))
@@ -459,7 +460,7 @@
 		      (- (x-display-pixel-height) (car (cdr pfy)) pfh)
 		    (car (cdr pfy)))))
       (cond ((eq location 'right)
-	     (setq newleft (+ pfx pfw 5)
+	     (setq newleft (+ pfx pfw 10)
 		   newtop pfy))
 	    ((eq location 'left)
 	     (setq newleft (- pfx 10 nfw)
@@ -471,7 +472,7 @@
 		   ;; extra 10 is just dressings for window
 		   ;; decorations.
 		   (let* ((left-guess (- pfx 10 nfw))
-			  (right-guess (+ pfx pfw 5))
+			  (right-guess (+ pfx pfw 10))
 			  (left-margin left-guess)
 			  (right-margin (- (x-display-pixel-width)
 					   right-guess 5 nfw)))

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-09-14 20:32:35 +0000
+++ src/ChangeLog	2010-09-16 18:02:53 +0000
@@ -1,3 +1,8 @@
+2010-09-16  Stephen Berman  <address@hidden>
+
+	* frame.c (Ftool_bar_pixel_width): New function to expose tool
+	bar's pixel width to Lisp.
+
 2010-09-14  Juanma Barranquero  <address@hidden>
 
 	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.

=== modified file 'src/frame.c'
--- src/frame.c	2010-08-08 21:03:45 +0000
+++ src/frame.c	2010-09-16 12:22:21 +0000
@@ -2649,6 +2649,29 @@
 #endif
     return make_number (FRAME_COLS (f));
 }
+
+DEFUN ("tool-bar-pixel-width", Ftool_bar_pixel_width,
+       Stool_bar_pixel_width, 0, 1, 0,
+       doc: /* Return width in pixels of FRAME's tool bar.
+The result is greater than zero only when the tool bar is on the left
+or right side of FRAME.  If FRAME is omitted, the selected frame is
+used.  */)
+  (Lisp_Object frame)
+{
+  struct frame *f;
+
+  if (NILP (frame))
+    frame = selected_frame;
+  CHECK_FRAME (frame);
+  f = XFRAME (frame);
+
+#ifdef HAVE_WINDOW_SYSTEM
+  if (FRAME_WINDOW_P (f))
+    return make_number (FRAME_TOOLBAR_WIDTH (f));
+  else
+#endif
+    return 0;
+}
 
 DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0,
        doc: /* Specify that the frame FRAME has LINES lines.
@@ -4596,6 +4619,7 @@
   defsubr (&Sframe_char_width);
   defsubr (&Sframe_pixel_height);
   defsubr (&Sframe_pixel_width);
+  defsubr (&Stool_bar_pixel_width);
   defsubr (&Sset_frame_height);
   defsubr (&Sset_frame_width);
   defsubr (&Sset_frame_size);