Mercurial > emacs
changeset 111191:ed5bac97776a
* term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map. * term/common-win.el (x-setup-function-keys): Remove most of the keymappings. Comment on the remaining ones.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Tue, 26 Oct 2010 16:20:00 +0300 |
| parents | 6174c15098f6 |
| children | a514b8e891c0 |
| files | lisp/ChangeLog lisp/term/common-win.el lisp/term/ns-win.el |
| diffstat | 3 files changed, 13 insertions(+), 96 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Oct 26 00:42:46 2010 -0700 +++ b/lisp/ChangeLog Tue Oct 26 16:20:00 2010 +0300 @@ -1,3 +1,10 @@ +2010-10-26 Adrian Robert <Adrian.B.Robert@gmail.com> + + * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to + global map. + * term/common-win.el (x-setup-function-keys): Remove most of the + keymappings. Comment on the remaining ones. + 2010-10-26 Peter Oliver <p.d.oliver@mavit.org.uk> (tiny change) * server.el (server-port): New option. (Bug#854)
--- a/lisp/term/common-win.el Tue Oct 26 00:42:46 2010 -0700 +++ b/lisp/term/common-win.el Tue Oct 26 16:20:00 2010 +0300 @@ -113,6 +113,7 @@ interprogram-paste-function 'x-selection-value system-key-alist (list + ;; These are special "keys" used to pass events from C to lisp. (cons (logior (lsh 0 16) 1) 'ns-power-off) (cons (logior (lsh 0 16) 2) 'ns-open-file) (cons (logior (lsh 0 16) 3) 'ns-open-temp-file) @@ -124,100 +125,10 @@ ;;; (cons (logior (lsh 0 16) 9) 'ns-insert-working-text) ;;; (cons (logior (lsh 0 16) 10) 'ns-delete-working-text) (cons (logior (lsh 0 16) 11) 'ns-spi-service-call) - (cons (logior (lsh 0 16) 12) 'ns-new-frame) +;;; (cons (logior (lsh 0 16) 12) 'ns-new-frame) (cons (logior (lsh 0 16) 13) 'ns-toggle-toolbar) - (cons (logior (lsh 0 16) 14) 'ns-show-prefs) - (cons (logior (lsh 1 16) 32) 'f1) - (cons (logior (lsh 1 16) 33) 'f2) - (cons (logior (lsh 1 16) 34) 'f3) - (cons (logior (lsh 1 16) 35) 'f4) - (cons (logior (lsh 1 16) 36) 'f5) - (cons (logior (lsh 1 16) 37) 'f6) - (cons (logior (lsh 1 16) 38) 'f7) - (cons (logior (lsh 1 16) 39) 'f8) - (cons (logior (lsh 1 16) 40) 'f9) - (cons (logior (lsh 1 16) 41) 'f10) - (cons (logior (lsh 1 16) 42) 'f11) - (cons (logior (lsh 1 16) 43) 'f12) - (cons (logior (lsh 1 16) 44) 'kp-insert) - (cons (logior (lsh 1 16) 45) 'kp-delete) - (cons (logior (lsh 1 16) 46) 'kp-home) - (cons (logior (lsh 1 16) 47) 'kp-end) - (cons (logior (lsh 1 16) 48) 'kp-prior) - (cons (logior (lsh 1 16) 49) 'kp-next) - (cons (logior (lsh 1 16) 50) 'print-screen) - (cons (logior (lsh 1 16) 51) 'scroll-lock) - (cons (logior (lsh 1 16) 52) 'pause) - (cons (logior (lsh 1 16) 53) 'system) - (cons (logior (lsh 1 16) 54) 'break) - ;; Erm, this looks like a FIXME... - (cons (logior (lsh 1 16) 56) - 'please-tell-carl-what-this-key-is-called-56) - (cons (logior (lsh 1 16) 61) - 'please-tell-carl-what-this-key-is-called-61) - (cons (logior (lsh 1 16) 62) - 'please-tell-carl-what-this-key-is-called-62) - (cons (logior (lsh 1 16) 63) - 'please-tell-carl-what-this-key-is-called-63) - (cons (logior (lsh 1 16) 64) - 'please-tell-carl-what-this-key-is-called-64) - (cons (logior (lsh 1 16) 69) - 'please-tell-carl-what-this-key-is-called-69) - (cons (logior (lsh 1 16) 70) - 'please-tell-carl-what-this-key-is-called-70) - (cons (logior (lsh 1 16) 71) - 'please-tell-carl-what-this-key-is-called-71) - (cons (logior (lsh 1 16) 72) - 'please-tell-carl-what-this-key-is-called-72) - (cons (logior (lsh 1 16) 73) - 'please-tell-carl-what-this-key-is-called-73) - (cons (logior (lsh 2 16) 3) 'kp-enter) - (cons (logior (lsh 2 16) 9) 'kp-tab) - (cons (logior (lsh 2 16) 28) 'kp-quit) - (cons (logior (lsh 2 16) 35) 'kp-hash) - (cons (logior (lsh 2 16) 42) 'kp-multiply) - (cons (logior (lsh 2 16) 43) 'kp-add) - (cons (logior (lsh 2 16) 44) 'kp-separator) - (cons (logior (lsh 2 16) 45) 'kp-subtract) - (cons (logior (lsh 2 16) 46) 'kp-decimal) - (cons (logior (lsh 2 16) 47) 'kp-divide) - (cons (logior (lsh 2 16) 48) 'kp-0) - (cons (logior (lsh 2 16) 49) 'kp-1) - (cons (logior (lsh 2 16) 50) 'kp-2) - (cons (logior (lsh 2 16) 51) 'kp-3) - (cons (logior (lsh 2 16) 52) 'kp-4) - (cons (logior (lsh 2 16) 53) 'kp-5) - (cons (logior (lsh 2 16) 54) 'kp-6) - (cons (logior (lsh 2 16) 55) 'kp-7) - (cons (logior (lsh 2 16) 56) 'kp-8) - (cons (logior (lsh 2 16) 57) 'kp-9) - (cons (logior (lsh 2 16) 60) 'kp-less) - (cons (logior (lsh 2 16) 61) 'kp-equal) - (cons (logior (lsh 2 16) 62) 'kp-more) - (cons (logior (lsh 2 16) 64) 'kp-at) - (cons (logior (lsh 2 16) 92) 'kp-backslash) - (cons (logior (lsh 2 16) 96) 'kp-backtick) - (cons (logior (lsh 2 16) 124) 'kp-bar) - (cons (logior (lsh 2 16) 126) 'kp-tilde) - (cons (logior (lsh 2 16) 157) 'kp-mu) - (cons (logior (lsh 2 16) 165) 'kp-yen) - (cons (logior (lsh 2 16) 167) 'kp-paragraph) - (cons (logior (lsh 2 16) 172) 'left) - (cons (logior (lsh 2 16) 173) 'up) - (cons (logior (lsh 2 16) 174) 'right) - (cons (logior (lsh 2 16) 175) 'down) - (cons (logior (lsh 2 16) 176) 'kp-ring) - (cons (logior (lsh 2 16) 201) 'kp-square) - (cons (logior (lsh 2 16) 204) 'kp-cube) - (cons (logior (lsh 3 16) 8) 'backspace) - (cons (logior (lsh 3 16) 9) 'tab) - (cons (logior (lsh 3 16) 10) 'linefeed) - (cons (logior (lsh 3 16) 11) 'clear) - (cons (logior (lsh 3 16) 13) 'return) - (cons (logior (lsh 3 16) 18) 'pause) - (cons (logior (lsh 3 16) 25) 'S-tab) - (cons (logior (lsh 3 16) 27) 'escape) - (cons (logior (lsh 3 16) 127) 'delete))))) +;;; (cons (logior (lsh 0 16) 14) 'ns-show-prefs) + )))) (set-terminal-parameter frame 'x-setup-function-keys t))) (defvar x-invocation-args)
--- a/lisp/term/ns-win.el Tue Oct 26 00:42:46 2010 -0700 +++ b/lisp/term/ns-win.el Tue Oct 26 16:20:00 2010 +0300 @@ -163,7 +163,8 @@ ;; Special Nextstep-generated events are converted to function keys. Here -;; are the bindings for them. +;; are the bindings for them. Note, these keys are actually declared in +;; x-setup-function-keys in common-win. (define-key global-map [ns-power-off] 'save-buffers-kill-emacs) (define-key global-map [ns-open-file] 'ns-find-file) (define-key global-map [ns-open-temp-file] [ns-open-file]) @@ -174,9 +175,7 @@ (define-key global-map [ns-change-font] 'ns-respond-to-change-font) (define-key global-map [ns-open-file-line] 'ns-open-file-select-line) (define-key global-map [ns-spi-service-call] 'ns-spi-service-call) -(define-key global-map [ns-new-frame] 'make-frame) (define-key global-map [ns-toggle-toolbar] 'ns-toggle-toolbar) -(define-key global-map [ns-show-prefs] 'customize) ;; Set up a number of aliases and other layers to pretend we're using