diff options
| author | YAMAMOTO Mitsuharu | 2007-08-27 08:33:14 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2007-08-27 08:33:14 +0000 |
| commit | a225da012cf8f41c6978dc2fd884be23792adb76 (patch) | |
| tree | 204b18be6678fc1da7d4b9d35bcdcd4a2bba9259 | |
| parent | a186cc54a2edf492b8dd4c615af7872e0e0c4e58 (diff) | |
| download | emacs-a225da012cf8f41c6978dc2fd884be23792adb76.tar.gz emacs-a225da012cf8f41c6978dc2fd884be23792adb76.zip | |
(mac-handle-toolbar-switch-mode): Add explicit
argument to tool-bar-mode call.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/mac-win.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7a977672a22..1bfbc6f3460 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-08-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * term/mac-win.el (mac-handle-toolbar-switch-mode): Add explicit | ||
| 4 | argument to tool-bar-mode call. | ||
| 5 | |||
| 1 | 2007-08-27 Glenn Morris <rgm@gnu.org> | 6 | 2007-08-27 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * diff-mode.el (diff-find-file-name): Only accept regular files, | 8 | * 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 2e03b8517b5..314989906dd 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el | |||
| @@ -1785,12 +1785,12 @@ Currently the `mailto' scheme is supported." | |||
| 1785 | "Toggle visibility of tool-bars in response to EVENT. | 1785 | "Toggle visibility of tool-bars in response to EVENT. |
| 1786 | With no keyboard modifiers, it toggles the visibility of the | 1786 | With no keyboard modifiers, it toggles the visibility of the |
| 1787 | frame where the tool-bar toggle button was pressed. With some | 1787 | frame where the tool-bar toggle button was pressed. With some |
| 1788 | modifiers, it changes global tool-bar visibility setting." | 1788 | modifiers, it changes the global tool-bar visibility setting." |
| 1789 | (interactive "e") | 1789 | (interactive "e") |
| 1790 | (let ((ae (mac-event-ae event))) | 1790 | (let ((ae (mac-event-ae event))) |
| 1791 | (if (mac-ae-keyboard-modifiers ae) | 1791 | (if (mac-ae-keyboard-modifiers ae) |
| 1792 | ;; Globally toggle tool-bar-mode if some modifier key is pressed. | 1792 | ;; Globally toggle tool-bar-mode if some modifier key is pressed. |
| 1793 | (tool-bar-mode) | 1793 | (tool-bar-mode 'toggle) |
| 1794 | (let ((frame (mac-ae-frame ae))) | 1794 | (let ((frame (mac-ae-frame ae))) |
| 1795 | (set-frame-parameter frame 'tool-bar-lines | 1795 | (set-frame-parameter frame 'tool-bar-lines |
| 1796 | (if (= (frame-parameter frame 'tool-bar-lines) 0) | 1796 | (if (= (frame-parameter frame 'tool-bar-lines) 0) |