changeset 110456:8d106071e2c8

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.
author Jan D. <jan.h.d@swipnet.se>
date Tue, 21 Sep 2010 09:31:01 +0200
parents c82718dcce89
children f963581bbc72
files lisp/ChangeLog lisp/menu-bar.el
diffstat 2 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Sep 21 09:01:22 2010 +0200
+++ b/lisp/ChangeLog	Tue Sep 21 09:31:01 2010 +0200
@@ -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>
--- a/lisp/menu-bar.el	Tue Sep 21 09:01:22 2010 +0200
+++ b/lisp/menu-bar.el	Tue Sep 21 09:31:01 2010 +0200
@@ -691,7 +691,7 @@
 		   ;; 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 @@
 
 (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 @@
   "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)