Merged from miles@gnu.org--gnu-2005 (patch 37-38, 162-182)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-162
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-163
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-164
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-165
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-166
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-167
   Tweak obsolete function/variable warning message

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-168
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-169
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-170
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-171
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-172
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-173
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-174
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-175
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-176
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-177
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-178
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-179
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-180
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-181
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-182
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-37
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-38
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-309

1 files changed, 16 insertions, 7 deletions

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index d43264f275e..69438c349a4 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1010,20 +1010,29 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 
 ;; 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])
-(define-key function-key-map [tab] [?\t])
-(define-key function-key-map [M-tab] [?\M-\t])
 (define-key function-key-map [backspace] [?\d])
-(define-key function-key-map [M-backspace] [?\M-\d])
+(define-key function-key-map [delete] [?\d])
+(define-key function-key-map [tab] [?\t])
+(define-key function-key-map [linefeed] [?\n])
+(define-key function-key-map [clear] [?\C-l])
+(define-key function-key-map [return] [?\C-m])
 (define-key function-key-map [escape] [?\e])
+(define-key function-key-map [M-backspace] [?\M-\d])
+(define-key function-key-map [M-delete] [?\M-\d])
+(define-key function-key-map [M-tab] [?\M-\t])
+(define-key function-key-map [M-linefeed] [?\M-\n])
+(define-key function-key-map [M-clear] [?\M-\C-l])
+(define-key function-key-map [M-return] [?\M-\C-m])
 (define-key function-key-map [M-escape] [?\M-\e])
 
 ;; These tell read-char how to convert
 ;; these special chars to ASCII.
-(put 'return 'ascii-character ?\C-m)
-(put 'tab 'ascii-character ?\t)
 (put 'backspace 'ascii-character ?\d)
+(put 'delete 'ascii-character ?\d)
+(put 'tab 'ascii-character ?\t)
+(put 'linefeed 'ascii-character ?\n)
+(put 'clear 'ascii-character ?\C-l)
+(put 'return 'ascii-character ?\C-m)
 (put 'escape 'ascii-character ?\e)