diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-21 04:55:30 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-21 04:55:30 +0000 |
| commit | 1fb072d1dff954c21d4805196df62c8eeead301c (patch) | |
| tree | da374db1a51e2a355b46f26a1c99e1ac5db5dca4 /lisp/term/mac-win.el | |
| parent | aaf34461ff5804e5cebe163b31e535da72e81d87 (diff) | |
| parent | bdaf8a62d53cf8d5a0dc4f0dc530ecd6fc1f44fe (diff) | |
| download | emacs-1fb072d1dff954c21d4805196df62c8eeead301c.tar.gz emacs-1fb072d1dff954c21d4805196df62c8eeead301c.tar.bz2 emacs-1fb072d1dff954c21d4805196df62c8eeead301c.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 852-856)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32
Diffstat (limited to 'lisp/term/mac-win.el')
| -rw-r--r-- | lisp/term/mac-win.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index f7be9fd73fd..d9660fd9f06 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1794,7 +1794,7 @@ Currently the `mailto' scheme is supported." (define-key mac-apple-event-map [internet-event get-url] 'mac-ae-get-url) -(define-key mac-apple-event-map [hi-command about] 'display-splash-screen) +(define-key mac-apple-event-map [hi-command about] 'about-emacs) ;;; Converted Carbon Events (defun mac-handle-toolbar-switch-mode (event) |