From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 20 Jun 2007 05:55:06 +0000 (+0000)
Subject: * term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~72
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b647cd3fd066110b9efb77c66b0dd304eb7ca504;p=emacs.git

* term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.
---

diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index 5fe8ab51c50..0d89f9d15ca 100644
--- a/lisp/ChangeLog.multi-tty
+++ b/lisp/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-06-18  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* term/xterm.el (terminal-init-xterm): Revert bad merge from trunk.
+
 2007-06-12  Juanma Barranquero  <lekktu@gmail.com>
 
 	* server.el (server-process-filter): Fix typo in docstring.