From 36a1b6dba765828d617d6e4481f04acd3f809ad1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Tue, 21 Sep 2010 09:31:01 +0200
Subject: [PATCH] Use tool-bar-position in menu Options/Show.

* menu-bar.el (menu-bar-set-tool-bar-position): customize-set-variable
tool-bar-position.  Don't modify frame parameters here.
---
 lisp/ChangeLog   |  3 +++
 lisp/menu-bar.el | 11 ++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e7ae954b8a..6d4b07bb18b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-21  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* menu-bar.el (menu-bar-set-tool-bar-position): customize-set-variable
+	tool-bar-position.  Don't modify frame parameters here.
+
 	* tool-bar.el (tool-bar-position): New defcustom (Bug#7049).
 
 2010-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index d0a8653f95c..0659ae98717 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -691,7 +691,7 @@ by \"Save Options\" in Custom buffers.")
 		   ;; Nonetheless, not saving it would like be confuse
 		   ;; more often.
 		   ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-11.
-		   text-mode-hook))
+		   text-mode-hook tool-bar-position))
       (and (get elt 'customized-value)
 	   (customize-mark-to-save elt)
 	   (setq need-save t)))
@@ -981,13 +981,7 @@ mail status in mode line"))
 
 (defun menu-bar-set-tool-bar-position (position)
   (customize-set-variable 'tool-bar-mode t)
-  (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
-						 default-frame-alist))))
-
+  (customize-set-variable 'tool-bar-position position))
 (defun menu-bar-showhide-tool-bar-menu-customize-disable ()
   "Do not display tool bars."
   (interactive)
@@ -996,7 +990,6 @@ mail status in mode line"))
   "Display tool bars on the left side."
   (interactive)
   (menu-bar-set-tool-bar-position 'left))
-
 (defun menu-bar-showhide-tool-bar-menu-customize-enable-right ()
   "Display tool bars on the right side."
   (interactive)
-- 
2.11.4.GIT