From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 20 Jan 2010 17:14:37 +0000 (-0500)
Subject: * lisp/term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).
X-Git-Tag: emacs-pretest-23.1.92~30^2~3^2~28
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5189d95ba6d95c10118fcf70ec382d11cf3062b4;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 800b2ad24c9..3d99f723a31 100644
--- 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 a619ed6ad66..7cb364af622 100644
--- 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))