Merged from emacs@sv.gnu.org

[gnu-emacs] / lisp / term / xterm.el

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index ecfeaba51fcab4bf01d4fe2e8984e723e021a21d..049d65c62fa8cd655c97c3123ddaa78e3a0a22a6 100644 (file)
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,6 +1,7 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -192,8 +193,8 @@
   ;; rxvt terminals sometimes set the TERM variable to "xterm", but
   ;; rxvt's keybindings that are incompatible with xterm's. It is
   ;; better in that case to use rxvt's initializion function.
-  (if (and (terminal-getenv "COLORTERM")
-          (string-match "\\`rxvt" (terminal-getenv "COLORTERM")))
+  (if (and (getenv "COLORTERM" (terminal-id))
+          (string-match "\\`rxvt" (getenv "COLORTERM" (terminal-id))))
       (progn
        (eval-and-compile (load "term/rxvt"))
        (terminal-init-rxvt))