# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1282724145 -32400
# Node ID 2e817b887353b8f64838e0aefddfa2e6a9b387c4
# Parent  d9cfc4f455fc58f5ef12a078e1a89dc87857d8ad# Parent  1c825c451dc0df491062d0ec6197696aa23bc926
merge trunk

diff -r d9cfc4f455fc -r 2e817b887353 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Aug 25 15:15:12 2010 +0900
+++ b/lisp/ChangeLog	Wed Aug 25 17:15:45 2010 +0900
@@ -6,6 +6,11 @@
 	* international/fontset.el (setup-default-fontset): Fix typo for
 	arabic OTF spec (fini->fina).
 
+2010-08-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* menu-bar.el (menu-bar-set-tool-bar-position): Set frame parameter
+	on all frames.
+
 2010-08-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
 	* whitespace.el: Allow cleaning up blanks without blank
diff -r d9cfc4f455fc -r 2e817b887353 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Wed Aug 25 15:15:12 2010 +0900
+++ b/lisp/menu-bar.el	Wed Aug 25 17:15:45 2010 +0900
@@ -970,7 +970,8 @@
 
 (defun menu-bar-set-tool-bar-position (position)
   (customize-set-variable 'tool-bar-mode t)
-  (set-frame-parameter nil 'tool-bar-position position)
+  (dolist (frame (frame-list))
+    (set-frame-parameter frame 'tool-bar-position position))
   (customize-set-variable 'default-frame-alist
 			  (cons (cons 'tool-bar-position position)
 				(assq-delete-all 'tool-bar-position