merge trunk

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 868667e4103..83d93e9b5ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index ed5c189252b..98cb061cccb 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -970,7 +970,8 @@ mail status in mode line"))
 
 (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