From 66b49b089fc27e774332e7e01999c6fe99744394 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Sun, 27 Jul 2008 02:28:50 +0000 Subject: fix up ns-extended-platform-support-mode --- lisp/ChangeLog | 6 ++++++ lisp/term/ns-win.el | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a3d16d183cf..18ec829473b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-07-26 Adrian Robert + + * 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 * net/tramp.el (tramp-handle-start-file-process): Set diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index d6416c1b16e..6b332976a4e 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -336,12 +336,8 @@ this defaults to \"printenv\"." :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 @@ this defaults to \"printenv\"." ;; 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) -- cgit v1.2.1