Switching return to be treated like an X keysym

4 files changed, 16 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb8bf3d0cf9..00e4d4979cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-04  Steven Tamm  <steventamm@mac.com>
+
+        * term/mac-win.el: Add lines to handle the new [return] event.
+
 2002-10-03  Stefan Monnier  <monnier@cs.yale.edu>
 
         * textmodes/fill.el (fill-paragraph): Give up if there's no
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index ef5ce486cef..25c66103dd9 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -246,6 +246,12 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 
 ;; (prefer-coding-system 'mac-roman)
 
+;; Map certain keypad keys into ASCII characters that people usually expect
+(define-key function-key-map [return] [?\C-m])
+(define-key function-key-map [M-return] [?\M-\C-m])
+;; Tell read-char how to convert special chars to ASCII
+(put 'return 'ascii-character 13)
+
 ;;
 ;; Available colors
 ;;
diff --git a/src/ChangeLog b/src/ChangeLog
index 4608db9e3b6..50149a01f05 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-04  Steven Tamm  <steventamm@mac.com>
+
+        * macterm.c (keycode_to_xkeysym_table): Change return to be 
+        treated like an X keysym
+
 2002-10-03  Jan D.  <jan.h.d@swipnet.se>
 
         * xterm.c (XTread_socket): For ConfigureNotify, with x and y == 0,
diff --git a/src/macterm.c b/src/macterm.c
index 705b3ec537c..09b6b9faaeb 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12534,7 +12534,7 @@ static unsigned char keycode_to_xkeysym_table[] = {
 /* 0x00 - 0x3f */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, '\x0d', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 /* 0x40 */
   0, '\xae' /* kp. */, 0, '\xaa' /* kp* */,