(tool-bar-mode): Modify all frame parameters when

toggling tool bars on.  (Bug#1754)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54cdb4fd16e9d8b25715871b4ec8ce66764eeeaa..91bd9efe56007280cd67edb002aea0befa080ed8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-10  Martin Rudalics  <rudalics@gmx.at>
+
+       * tool-bar.el (tool-bar-mode): Modify all frame parameters when
+       toggling tool bars on.  (Bug#1754)
+
 2009-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
        * faces.el (face-valid-attribute-values): Use string as value for

diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index a08df3124a869494a0ce3740236285337fc2481e..226b1ddba5cda731d49052873aeab3f1d2fe4e0f 100644 (file)
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -54,9 +54,12 @@ conveniently adding tool bar items."
   :group 'frames
   (if tool-bar-mode
       (progn
-       (dolist (frame (frame-list))
-         (if (display-graphic-p frame)
-             (set-frame-parameter frame 'tool-bar-lines 1)))
+       ;; Make one tool-bar-line for any - including non-graphical -
+       ;; terminal, see Bug#1754.  If this causes problems, we should
+       ;; handle the problem in `modify-frame-parameters' or do not
+       ;; call `modify-all-frames-parameters' when toggling the tool
+       ;; bar off either.
+       (modify-all-frames-parameters (list (cons 'tool-bar-lines 1)))
        (if (= 1 (length (default-value 'tool-bar-map))) ; not yet setup
            (tool-bar-setup)))
     (modify-all-frames-parameters (list (cons 'tool-bar-lines 0)))))