* e/eterm.ti: Add a comment.

* e/eterm: Regenerate.

* term.el (ansi-term-color-vector): Use the xterm colors.
(term-raw-map): Don't add mappings for \eO and \e[. Map
deletechar.

5 files changed, 19 insertions, 4 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 47e867e4248..b7a470f9618 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * e/eterm.ti: Add a comment.
+        * e/eterm: Regenerate.
+
 2005-04-25  Alex Ott  <ott@jet.msk.su>
 
         * TUTORIAL.ru: Update.
diff --git a/etc/e/eterm b/etc/e/eterm
index 0fcb95170ee..09d184fd762 100644
--- a/etc/e/eterm
+++ b/etc/e/eterm
diff --git a/etc/e/eterm.ti b/etc/e/eterm.ti
index 2b600df0a12..8f88f0e6f88 100644
--- a/etc/e/eterm.ti
+++ b/etc/e/eterm.ti
@@ -1,4 +1,4 @@
-eterm,
+eterm|Emacs term.el terminal emulator term-protocol-version 0.96,
         colors#8,
         cols#80,
         lines#24,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34240ae9124..490d410e858 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term.el (ansi-term-color-vector): Use the xterm colors.
+        (term-raw-map): Don't add mappings for \eO and \e[. Map
+        deletechar.
+
 2005-04-25  Lute Kamstra  <lute@gnu.org>
 
         * font-core.el (font-lock-defaults): Fix docstring.
diff --git a/lisp/term.el b/lisp/term.el
index b1ce432144e..473fafd558a 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -711,9 +711,10 @@ Buffer local variable.")
   :group 'term
   :type 'string)
 
+;;; Use the same colors that xterm uses, see `xterm-standard-colors'.
 (defvar ansi-term-color-vector
-  [unspecified "black" "red" "green" "yellow" "blue"
-   "magenta" "cyan" "white"])
+  [unspecified "black" "red3" "green3" "yellow3" "blue2"
+   "magenta3" "cyan3" "white"])
 
 ;;; Inspiration came from comint.el -mm
 (defvar term-buffer-maximum-size 2048
@@ -886,7 +887,9 @@ is buffer-local.")
        (i 0))
   (while (< i 128)
     (define-key map (make-string 1 i) 'term-send-raw)
-    (define-key esc-map (make-string 1 i) 'term-send-raw-meta)
+    ;; Avoid O and [. They are used in escape sequences for various keys.
+    (unless (or (eq i ?O) (eq i 91)) 
+                (define-key esc-map (make-string 1 i) 'term-send-raw-meta))
     (setq i (1+ i)))
   (dolist (elm (generic-character-list))
     (define-key map (vector elm) 'term-send-raw))
@@ -909,6 +912,7 @@ is buffer-local.")
     (define-key term-raw-map [right] 'term-send-right)
     (define-key term-raw-map [left] 'term-send-left)
     (define-key term-raw-map [delete] 'term-send-del)
+    (define-key term-raw-map [deletechar] 'term-send-del)
     (define-key term-raw-map [backspace] 'term-send-backspace)
     (define-key term-raw-map [home] 'term-send-home)
     (define-key term-raw-map [end] 'term-send-end)