* lisp/term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 800b2ad24c9af69d5f651aa2fc9dcbb655697914..3d99f723a310e7f052e215c769b02a80b57bd0cb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+       * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).
+
 2010-01-20  Glenn Morris  <rgm@gnu.org>
 
        * indent.el (tab-always-indent): Fix custom-type.

diff --git a/lisp/term.el b/lisp/term.el
index a619ed6ad661bc58923da3756be8fe460d4bac01..7cb364af62254090664fd77d20e850fad70f7e5b 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1208,8 +1208,17 @@ without any interpretation."
 
 (defun term-send-raw-meta ()
   (interactive)
-  (let* ((keys (this-command-keys))
-         (char (aref keys (1- (length keys)))))
+  (let ((char last-input-event))
+    (when (symbolp last-input-event)
+      ;; Convert `return' to C-m, etc.
+      (let ((tmp (get char 'event-symbol-elements)))
+       (when tmp
+         (setq char (car tmp)))
+       (when (symbolp char)
+         (setq tmp (get char 'ascii-character))
+         (when tmp
+           (setq char tmp)))))
+    (setq char (event-basic-type char))
     (term-send-raw-string (if (and (numberp char)
                                   (> char 127)
                                   (< char 256))