From 79cb9c05a1cfe80eb035c54f2036320de88c3056 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Tue, 13 Jul 2010 13:41:49 +0300 Subject: [PATCH] term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew Dempsky; bug#5084). Remove incorrect binding for S-tab. (ns-alternatives-map): Change S-tab binding to backtab (bug#6616). * simple.el (normal-erase-is-backspace-setup-frame): Set mode on under ns. --- lisp/ChangeLog | 10 ++++++++++ lisp/simple.el | 1 + lisp/term/ns-win.el | 6 ++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 98a20ff2b65..a0cb057e475 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2010-07-13 Adrian Robert + + * term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew + Dempsky; bug#5084). Remove incorrect binding for S-tab. + (ns-alternatives-map): Change S-tab binding to backtab + (bug#6616). + + * simple.el (normal-erase-is-backspace-setup-frame): Set mode on + under ns. + 2010-07-12 Andreas Schwab * language/tai-viet.el ("TaiViet"): Try to fix re-encoding diff --git a/lisp/simple.el b/lisp/simple.el index a7876335c17..fdd8521eee1 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -6522,6 +6522,7 @@ call `normal-erase-is-backspace-mode' (which see) instead." (if (if (eq normal-erase-is-backspace 'maybe) (and (not noninteractive) (or (memq system-type '(ms-dos windows-nt)) + (memq window-system '(ns)) (and (memq window-system '(x)) (fboundp 'x-backspace-delete-keys-p) (x-backspace-delete-keys-p)) diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index a53d0346d94..f73b3d7e67e 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -186,14 +186,11 @@ The properties returned may include `top', `left', `height', and `width'." ;;;; Keyboard mapping. -;; These tell read-char how to convert these special chars to ASCII. -(put 'S-tab 'ascii-character (logior 16 ?\t)) - (defvar ns-alternatives-map (let ((map (make-sparse-keymap))) ;; Map certain keypad keys into ASCII characters ;; that people usually expect. - (define-key map [S-tab] [25]) + (define-key map [S-tab] [backtab]) (define-key map [M-backspace] [?\M-\d]) (define-key map [M-delete] [?\M-\d]) (define-key map [M-tab] [?\M-\t]) @@ -208,6 +205,7 @@ The properties returned may include `top', `left', `height', and `width'." (define-key global-map [?\s-,] 'customize) (define-key global-map [?\s-'] 'next-multiframe-window) (define-key global-map [?\s-`] 'other-frame) +(define-key global-map [?\s-~] 'ns-prev-frame) (define-key global-map [?\s--] 'center-line) (define-key global-map [?\s-:] 'ispell) (define-key global-map [?\s-\;] 'ispell-next) -- 2.39.2