# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1279017709 -10800
# Node ID 863ed9bd7c0e1e3212a6b628ea9d1eee5b2cfafb
# Parent  409ecfd9731ee0560880cceac9f7d1293f8ab30e
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.

diff -r 409ecfd9731e -r 863ed9bd7c0e lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jul 12 21:54:28 2010 -0700
+++ b/lisp/ChangeLog	Tue Jul 13 13:41:49 2010 +0300
@@ -1,3 +1,13 @@
+2010-07-13  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* 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  <schwab@linux-m68k.org>
 
 	* language/tai-viet.el ("TaiViet"): Try to fix re-encoding
diff -r 409ecfd9731e -r 863ed9bd7c0e lisp/simple.el
--- a/lisp/simple.el	Mon Jul 12 21:54:28 2010 -0700
+++ b/lisp/simple.el	Tue Jul 13 13:41:49 2010 +0300
@@ -6522,6 +6522,7 @@
        (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 -r 409ecfd9731e -r 863ed9bd7c0e lisp/term/ns-win.el
--- a/lisp/term/ns-win.el	Mon Jul 12 21:54:28 2010 -0700
+++ b/lisp/term/ns-win.el	Tue Jul 13 13:41:49 2010 +0300
@@ -186,14 +186,11 @@
 
 ;;;; 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 @@
 (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)