[Emacs-diffs] emacs/lisp ChangeLog tool-bar.el

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       09/01/10 09:51:31

Modified files:
        lisp           : ChangeLog tool-bar.el 

Log message:
        (tool-bar-mode): Modify all frame parameters when
        toggling tool bars on.  (Bug#1754)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15078&r2=1.15079
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/tool-bar.el?cvsroot=emacs&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15078
retrieving revision 1.15079
diff -u -b -r1.15078 -r1.15079
--- ChangeLog   9 Jan 2009 14:10:46 -0000       1.15078
+++ ChangeLog   10 Jan 2009 09:51:28 -0000      1.15079
@@ -1,3 +1,8 @@
+2009-01-10  Martin Rudalics  <address@hidden>
+
+       * tool-bar.el (tool-bar-mode): Modify all frame parameters when
+       toggling tool bars on.  (Bug#1754)
+
 2009-01-09  Chong Yidong  <address@hidden>
 
        * faces.el (face-valid-attribute-values): Use string as value for

Index: tool-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/tool-bar.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- tool-bar.el 5 Jan 2009 03:19:50 -0000       1.23
+++ tool-bar.el 10 Jan 2009 09:51:31 -0000      1.24
@@ -54,9 +54,12 @@
   :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)))))