Mercurial > emacs
changeset 97042:0ac199626cb9 before-remove-carbon
fix up ns-extended-platform-support-mode
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Sun, 27 Jul 2008 02:28:50 +0000 |
| parents | 2f9e37c17512 |
| children | 9592c50233ab |
| files | lisp/ChangeLog lisp/term/ns-win.el |
| diffstat | 2 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Jul 27 02:25:02 2008 +0000 +++ b/lisp/ChangeLog Sun Jul 27 02:28:50 2008 +0000 @@ -1,3 +1,9 @@ +2008-07-26 Adrian Robert <Adrian.B.Robert@gmail.com> + + * term/ns-win.el (ns-extended-platform-support-mode): Get rid of + bindings for functions deleted by Dan N. 2008-07-21. Set + where-is-preferred-modifier. Add show-manual option to Help menu. + 2008-07-26 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-handle-start-file-process): Set
--- a/lisp/term/ns-win.el Sun Jul 27 02:25:02 2008 +0000 +++ b/lisp/term/ns-win.el Sun Jul 27 02:28:50 2008 +0000 @@ -336,12 +336,8 @@ :group 'ns (if ns-extended-platform-support-mode (progn - (global-set-key [M-up] 'down-one) - (global-set-key [M-down] 'up-one) - ;; These conflict w/word-left, word-right. - ;;(global-set-key [M-left] 'left-one) - ;;(global-set-key [M-right] 'right-one) - + (defun ns-show-manual () "Show Emacs.app manual" (interactive) (info "ns-emacs")) + (setq where-is-preferred-modifier 'super) (setq scroll-preserve-screen-position t) (transient-mark-mode 1) @@ -349,16 +345,20 @@ ;; Nextstep-specific items (easy-menu-remove-item global-map '("menu-bar") 'file) (easy-menu-add-item global-map '(menu-bar) - (cons "File" menu-bar-ns-file-menu) 'edit)) + (cons "File" menu-bar-ns-file-menu) 'edit) + (define-key menu-bar-help-menu [ns-manual] + '(menu-item "Emacs.app Manual" ns-show-manual))) (progn ;; Undo everything above. - (global-unset-key [M-up]) - (global-unset-key [M-down]) + (fmakunbound 'ns-show-manual) + (setq where-is-preferred-modifier 'nil) (setq scroll-preserve-screen-position nil) (transient-mark-mode 0) (easy-menu-remove-item global-map '("menu-bar") 'file) (easy-menu-add-item global-map '(menu-bar) - (cons "File" menu-bar-file-menu) 'edit)))) + (cons "File" menu-bar-file-menu) 'edit) + (easy-menu-remove-item global-map '("menu-bar" "help-menu") 'ns-manual) +))) (defun x-setup-function-keys (frame)