From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 27 Aug 2007 08:30:37 +0000 (+0000)
Subject: (mac-handle-toolbar-switch-mode): Add explicit
X-Git-Tag: emacs-pretest-23.0.90~11261
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8a2e0b2a692dfee47dcec6f77b39210ae511db35;p=emacs.git

(mac-handle-toolbar-switch-mode): Add explicit
argument to tool-bar-mode call.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a977ef4e970..cc03224e2dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-handle-toolbar-switch-mode): Add explicit
+	argument to tool-bar-mode call.
+
 2007-08-27  Glenn Morris  <rgm@gnu.org>
 
 	* diff-mode.el (diff-find-file-name): Only accept regular files,
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index b9f28323694..e39e1fffeb0 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1798,12 +1798,12 @@ Currently the `mailto' scheme is supported."
   "Toggle visibility of tool-bars in response to EVENT.
 With no keyboard modifiers, it toggles the visibility of the
 frame where the tool-bar toggle button was pressed.  With some
-modifiers, it changes global tool-bar visibility setting."
+modifiers, it changes the global tool-bar visibility setting."
   (interactive "e")
   (let ((ae (mac-event-ae event)))
     (if (mac-ae-keyboard-modifiers ae)
 	;; Globally toggle tool-bar-mode if some modifier key is pressed.
-	(tool-bar-mode)
+	(tool-bar-mode 'toggle)
       (let ((frame (mac-ae-frame ae)))
 	(set-frame-parameter frame 'tool-bar-lines
 			     (if (= (frame-parameter frame 'tool-bar-lines) 0)