# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1189810735 0
# Node ID cad259e522a57e791b7e929d62aff87b1a566740
# Parent  d90048b1caa3e44ce03982cca09c2760ba0f1255
(xterm-function-map): Replace bindings that were
deleted by the merge.

diff -r d90048b1caa3 -r cad259e522a5 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 14 22:51:44 2007 +0000
+++ b/lisp/ChangeLog	Fri Sep 14 22:58:55 2007 +0000
@@ -1,6 +1,7 @@
 2007-09-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
-	* term/xterm.el (xterm-function-map): Delete duplicated entries.
+	* term/xterm.el (xterm-function-map): Replace bindings that were
+	deleted by the merge.
 
 2007-09-14  Ulf Jasper  <ulf.jasper@web.de>
 
diff -r d90048b1caa3 -r cad259e522a5 lisp/term/xterm.el
--- a/lisp/term/xterm.el	Fri Sep 14 22:51:44 2007 +0000
+++ b/lisp/term/xterm.el	Fri Sep 14 22:58:55 2007 +0000
@@ -352,6 +352,20 @@
     (define-key map "\e[D" [left])
     (define-key map "\e[1~" [home])
 
+    (define-key map "\eO2A" [S-up])
+    (define-key map "\eO2B" [S-down])
+    (define-key map "\eO2C" [S-right])
+    (define-key map "\eO2D" [S-left])
+    (define-key map "\eO2F" [S-end])
+    (define-key map "\eO2H" [S-home])
+
+    (define-key map "\eO5A" [C-up])
+    (define-key map "\eO5B" [C-down])
+    (define-key map "\eO5C" [C-right])
+    (define-key map "\eO5D" [C-left])
+    (define-key map "\eO5F" [C-end])
+    (define-key map "\eO5H" [C-home])
+
     (define-key map "\e[11~" [f1])
     (define-key map "\e[12~" [f2])
     (define-key map "\e[13~" [f3])