[Emacs-diffs] /srv/bzr/emacs/trunk r101518: Use tool-bar-position in menu Options/Show.

[Jan D.]

------------------------------------------------------------
revno: 101518
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2010-09-21 09:31:01 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/menu-bar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-21 07:01:22 +0000
+++ b/lisp/ChangeLog    2010-09-21 07:31:01 +0000
@@ -1,5 +1,8 @@
 2010-09-21  Jan Djärv  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2010-09-14 14:41:53 +0000
+++ b/lisp/menu-bar.el  2010-09-21 07:31:01 +0000
@@ -691,7 +691,7 @@
                   ;; Nonetheless, not saving it would like be confuse
                   ;; more often.
                   ;; -- Per Abrahamsen <address@hidden> 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)