aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Tamm <[email protected]>2002-10-04 15:03:02 +0000
committerSteven Tamm <[email protected]>2002-10-04 15:03:02 +0000
commite989b9bcaf49b784c015cd5e0f9a868f29877f4c (patch)
treee9772d201a0242b0e3849e83accd4c0208a222d5
parent52402e4fc50aae9c32f04ec22a1a873631a29bad (diff)
Switching return to be treated like an X keysym
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/mac-win.el6
-rw-r--r--src/ChangeLog5
-rw-r--r--src/macterm.c2
4 files changed, 16 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb8bf3d0cf..00e4d4979c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-04 Steven Tamm <[email protected]>
+
+ * term/mac-win.el: Add lines to handle the new [return] event.
+
2002-10-03 Stefan Monnier <[email protected]>
* 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 ef5ce486ce..25c66103dd 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 4608db9e3b..50149a01f0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-04 Steven Tamm <[email protected]>
+
+ * macterm.c (keycode_to_xkeysym_table): Change return to be
+ treated like an X keysym
+
2002-10-03 Jan D. <[email protected]>
* xterm.c (XTread_socket): For ConfigureNotify, with x and y == 0,
diff --git a/src/macterm.c b/src/macterm.c
index 705b3ec537..09b6b9faae 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* */,