# HG changeset patch
# User Steven Tamm <steventamm@mac.com>
# Date 1033743782 0
# Node ID aeb8117c21015823e85126a43ad47ee967112599
# Parent  48947cde562f3cf560f09630c4296460af969705
Switching return to be treated like an X keysym

diff -r 48947cde562f -r aeb8117c2101 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Oct 04 10:09:35 2002 +0000
+++ b/lisp/ChangeLog	Fri Oct 04 15:03:02 2002 +0000
@@ -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 -r 48947cde562f -r aeb8117c2101 lisp/term/mac-win.el
--- a/lisp/term/mac-win.el	Fri Oct 04 10:09:35 2002 +0000
+++ b/lisp/term/mac-win.el	Fri Oct 04 15:03:02 2002 +0000
@@ -246,6 +246,12 @@
 
 ;; (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 -r 48947cde562f -r aeb8117c2101 src/ChangeLog
--- a/src/ChangeLog	Fri Oct 04 10:09:35 2002 +0000
+++ b/src/ChangeLog	Fri Oct 04 15:03:02 2002 +0000
@@ -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 -r 48947cde562f -r aeb8117c2101 src/macterm.c
--- a/src/macterm.c	Fri Oct 04 10:09:35 2002 +0000
+++ b/src/macterm.c	Fri Oct 04 15:03:02 2002 +0000
@@ -12534,7 +12534,7 @@
 /* 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* */,