Merged from miles@gnu.org--gnu-2005 (patch 68, 286-291)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-286
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-287
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-288
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-289
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-290
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-291
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-68
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-341

diff --cc lisp/files.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/xterm.el
index 037f321,d4fe99f..85808f2
--- 1/lisp/term/xterm.el
--- 2/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@@ -26,234 -26,223 +26,235 @@@
  
  ;;; Code:
  
- ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey
 +(require 'server)
 +
 +(defvar xterm-function-map (make-sparse-keymap)
 +  "Function key map overrides for xterm.")
 +
 -(substitute-key-definition [f13] [S-f1] function-key-map) 
++;; XXX We need to find a way to have these definitions be display-local. -- Lorentey
++
+ ;;; The terminal intialization C code file might have initialized
+ ;;; function keys F13->F60 from the termcap/terminfo information.  On
+ ;;; a PC-style keyboard these keys correspond to
+ ;;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-.  The
+ ;;; code here subsitutes the corresponding defintions in
+ ;;; function-key-map. This substitution is needed because if a key
+ ;;; definition if found in function-key-map, there are no further
+ ;;; lookups in other keymaps.
 -(substitute-key-definition [f25] [C-f1] function-key-map) 
++(substitute-key-definition [f13] [S-f1] function-key-map)
+ (substitute-key-definition [f14] [S-f2] function-key-map)
+ (substitute-key-definition [f15] [S-f3] function-key-map)
+ (substitute-key-definition [f16] [S-f4] function-key-map)
+ (substitute-key-definition [f17] [S-f5] function-key-map)
+ (substitute-key-definition [f18] [S-f6] function-key-map)
+ (substitute-key-definition [f19] [S-f7] function-key-map)
+ (substitute-key-definition [f20] [S-f8] function-key-map)
+ (substitute-key-definition [f21] [S-f9] function-key-map)
+ (substitute-key-definition [f22] [S-f10] function-key-map)
+ (substitute-key-definition [f23] [S-f11] function-key-map)
+ (substitute-key-definition [f24] [S-f12] function-key-map)
+ 
 -(substitute-key-definition [f37] [C-S-f1] function-key-map) 
++(substitute-key-definition [f25] [C-f1] function-key-map)
+ (substitute-key-definition [f26] [C-f2] function-key-map)
+ (substitute-key-definition [f27] [C-f3] function-key-map)
+ (substitute-key-definition [f28] [C-f4] function-key-map)
+ (substitute-key-definition [f29] [C-f5] function-key-map)
+ (substitute-key-definition [f30] [C-f6] function-key-map)
+ (substitute-key-definition [f31] [C-f7] function-key-map)
+ (substitute-key-definition [f32] [C-f8] function-key-map)
+ (substitute-key-definition [f33] [C-f9] function-key-map)
+ (substitute-key-definition [f34] [C-f10] function-key-map)
+ (substitute-key-definition [f35] [C-f11] function-key-map)
+ (substitute-key-definition [f36] [C-f12] function-key-map)
+ 
 -(substitute-key-definition [f49] [A-f1] function-key-map) 
++(substitute-key-definition [f37] [C-S-f1] function-key-map)
+ (substitute-key-definition [f38] [C-S-f2] function-key-map)
+ (substitute-key-definition [f39] [C-S-f3] function-key-map)
+ (substitute-key-definition [f40] [C-S-f4] function-key-map)
+ (substitute-key-definition [f41] [C-S-f5] function-key-map)
+ (substitute-key-definition [f42] [C-S-f6] function-key-map)
+ (substitute-key-definition [f43] [C-S-f7] function-key-map)
+ (substitute-key-definition [f44] [C-S-f8] function-key-map)
+ (substitute-key-definition [f45] [C-S-f9] function-key-map)
+ (substitute-key-definition [f46] [C-S-f10] function-key-map)
+ (substitute-key-definition [f47] [C-S-f11] function-key-map)
+ (substitute-key-definition [f48] [C-S-f12] function-key-map)
+ 
 -(let ((map (make-sparse-keymap)))
 -  (define-key map "\e[A" [up])
 -  (define-key map "\e[B" [down])
 -  (define-key map "\e[C" [right])
 -  (define-key map "\e[D" [left])
 -  (define-key map "\e[1~" [home])
 -  (define-key map "\e[2~" [insert])
 -  (define-key map "\e[3~" [delete])
 -  (define-key map "\e[4~" [select])
 -  (define-key map "\e[5~" [prior])
 -  (define-key map "\e[6~" [next])
 -  (define-key map "\e[11~" [f1])
 -  (define-key map "\e[12~" [f2])
 -  (define-key map "\e[13~" [f3])
 -  (define-key map "\e[14~" [f4])
 -  (define-key map "\e[15~" [f5])
 -  (define-key map "\e[17~" [f6])
 -  (define-key map "\e[18~" [f7])
 -  (define-key map "\e[19~" [f8])
 -  (define-key map "\e[20~" [f9])
 -  (define-key map "\e[21~" [f10])
 -  (define-key map "\e[23~" [f11])
 -  (define-key map "\e[24~" [f12])
 -  (define-key map "\e[29~" [print])
 -
 -  (define-key map "\eOP" [f1])
 -  (define-key map "\eOQ" [f2])
 -  (define-key map "\eOR" [f3])
 -  (define-key map "\eOS" [f4])
 -
 -  (define-key map "\eO2P" [S-f1])
 -  (define-key map "\eO2Q" [S-f2])
 -  (define-key map "\eO2R" [S-f3])
 -  (define-key map "\eO2S" [S-f4])
 -  (define-key map "\e[15;2~" [S-f5])
 -  (define-key map "\e[17;2~" [S-f6])
 -  (define-key map "\e[18;2~" [S-f7])
 -  (define-key map "\e[19;2~" [S-f8])
 -  (define-key map "\e[20;2~" [S-f9])
 -  (define-key map "\e[21;2~" [S-f10])
 -  (define-key map "\e[23;2~" [S-f11])
 -  (define-key map "\e[24;2~" [S-f12])
 -
 -  (define-key map "\eO5P" [C-f1])
 -  (define-key map "\eO5Q" [C-f2])
 -  (define-key map "\eO5R" [C-f3])
 -  (define-key map "\eO5S" [C-f4])
 -  (define-key map "\e[15;5~" [C-f5])
 -  (define-key map "\e[17;5~" [C-f6])
 -  (define-key map "\e[18;5~" [C-f7])
 -  (define-key map "\e[19;5~" [C-f8])
 -  (define-key map "\e[20;5~" [C-f9])
 -  (define-key map "\e[21;5~" [C-f10])
 -  (define-key map "\e[23;5~" [C-f11])
 -  (define-key map "\e[24;5~" [C-f12])
 -
 -  (define-key map "\eO6P" [C-S-f1])
 -  (define-key map "\eO6Q" [C-S-f2])
 -  (define-key map "\eO6R" [C-S-f3])
 -  (define-key map "\eO6S" [C-S-f4])
 -  (define-key map "\e[15;6~" [C-S-f5])
 -  (define-key map "\e[17;6~" [C-S-f6])
 -  (define-key map "\e[18;6~" [C-S-f7])
 -  (define-key map "\e[19;6~" [C-S-f8])
 -  (define-key map "\e[20;6~" [C-S-f9])
 -  (define-key map "\e[21;6~" [C-S-f10])
 -  (define-key map "\e[23;6~" [C-S-f11])
 -  (define-key map "\e[24;6~" [C-S-f12])
 -
 -  (define-key map "\eO3P" [A-f1])
 -  (define-key map "\eO3Q" [A-f2])
 -  (define-key map "\eO3R" [A-f3])
 -  (define-key map "\eO3S" [A-f4])
 -  (define-key map "\e[15;3~" [A-f5])
 -  (define-key map "\e[17;3~" [A-f6])
 -  (define-key map "\e[18;3~" [A-f7])
 -  (define-key map "\e[19;3~" [A-f8])
 -  (define-key map "\e[20;3~" [A-f9])
 -  (define-key map "\e[21;3~" [A-f10])
 -  (define-key map "\e[23;3~" [A-f11])
 -  (define-key map "\e[24;3~" [A-f12])
 -
 -  (define-key map "\e[1;2A" [S-up])
 -  (define-key map "\e[1;2B" [S-down])
 -  (define-key map "\e[1;2C" [S-right])
 -  (define-key map "\e[1;2D" [S-left])
 -  (define-key map "\e[1;2F" [S-end])
 -  (define-key map "\e[1;2H" [S-home])
 -
 -  (define-key map "\e[1;5A" [C-up])
 -  (define-key map "\e[1;5B" [C-down])
 -  (define-key map "\e[1;5C" [C-right])
 -  (define-key map "\e[1;5D" [C-left])
 -  (define-key map "\e[1;5F" [C-end])
 -  (define-key map "\e[1;5H" [C-home])
 -
 -  (define-key map "\e[1;6A" [C-S-up])
 -  (define-key map "\e[1;6B" [C-S-down])
 -  (define-key map "\e[1;6C" [C-S-right])
 -  (define-key map "\e[1;6D" [C-S-left])
 -  (define-key map "\e[1;6F" [C-S-end])
 -  (define-key map "\e[1;6H" [C-S-home])
 -
 -  (define-key map "\e[1;3A" [A-up])
 -  (define-key map "\e[1;3B" [A-down])
 -  (define-key map "\e[1;3C" [A-right])
 -  (define-key map "\e[1;3D" [A-left])
 -  (define-key map "\e[1;3F" [A-end])
 -  (define-key map "\e[1;3H" [A-home])
 -
 -  (define-key map "\e[2;2~" [S-insert])
 -  (define-key map "\e[3;2~" [S-delete])
 -  (define-key map "\e[5;2~" [S-prior])
 -  (define-key map "\e[6;2~" [S-next])
 -
 -  (define-key map "\e[2;5~" [C-insert])
 -  (define-key map "\e[3;5~" [C-delete])
 -  (define-key map "\e[5;5~" [C-prior])
 -  (define-key map "\e[6;5~" [C-next])
 -
 -  (define-key map "\e[2;6~" [C-S-insert])
 -  (define-key map "\e[3;6~" [C-S-delete])
 -  (define-key map "\e[5;6~" [C-S-prior])
 -  (define-key map "\e[6;6~" [C-S-next])
 -
 -  (define-key map "\e[2;3~" [A-insert])
 -  (define-key map "\e[3;3~" [A-delete])
 -  (define-key map "\e[5;3~" [A-prior])
 -  (define-key map "\e[6;3~" [A-next])
 -
 -  (define-key map "\eOA" [up])
 -  (define-key map "\eOB" [down])
 -  (define-key map "\eOC" [right])
 -  (define-key map "\eOD" [left])
 -  (define-key map "\eOF" [end])
 -  (define-key map "\eOH" [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])
 -
 -  ;; Use inheritance to let the main keymap override those defaults.
 -  ;; This way we don't override terminfo-derived settings or settings
 -  ;; made in the .emacs file.
 -  (set-keymap-parent map (keymap-parent function-key-map))
 -  (set-keymap-parent function-key-map map))
++(substitute-key-definition [f49] [A-f1] function-key-map)
+ (substitute-key-definition [f50] [A-f2] function-key-map)
+ (substitute-key-definition [f51] [A-f3] function-key-map)
+ (substitute-key-definition [f52] [A-f4] function-key-map)
+ (substitute-key-definition [f53] [A-f5] function-key-map)
+ (substitute-key-definition [f54] [A-f6] function-key-map)
+ (substitute-key-definition [f55] [A-f7] function-key-map)
+ (substitute-key-definition [f56] [A-f8] function-key-map)
+ (substitute-key-definition [f57] [A-f9] function-key-map)
+ (substitute-key-definition [f58] [A-f10] function-key-map)
+ (substitute-key-definition [f59] [A-f11] function-key-map)
+ (substitute-key-definition [f60] [A-f12] function-key-map)
+ 
 +(define-key xterm-function-map "\e[A" [up])
 +(define-key xterm-function-map "\e[B" [down])
 +(define-key xterm-function-map "\e[C" [right])
 +(define-key xterm-function-map "\e[D" [left])
 +(define-key xterm-function-map "\e[1~" [home])
 +(define-key xterm-function-map "\e[2~" [insert])
 +(define-key xterm-function-map "\e[3~" [delete])
 +(define-key xterm-function-map "\e[4~" [select])
 +(define-key xterm-function-map "\e[5~" [prior])
 +(define-key xterm-function-map "\e[6~" [next])
 +(define-key xterm-function-map "\e[11~" [f1])
 +(define-key xterm-function-map "\e[12~" [f2])
 +(define-key xterm-function-map "\e[13~" [f3])
 +(define-key xterm-function-map "\e[14~" [f4])
 +(define-key xterm-function-map "\e[15~" [f5])
 +(define-key xterm-function-map "\e[17~" [f6])
 +(define-key xterm-function-map "\e[18~" [f7])
 +(define-key xterm-function-map "\e[19~" [f8])
 +(define-key xterm-function-map "\e[20~" [f9])
 +(define-key xterm-function-map "\e[21~" [f10])
 +(define-key xterm-function-map "\e[23~" [f11])
 +(define-key xterm-function-map "\e[24~" [f12])
 +(define-key xterm-function-map "\e[29~" [print])
 +
 +(define-key xterm-function-map "\eOP" [f1])
 +(define-key xterm-function-map "\eOQ" [f2])
 +(define-key xterm-function-map "\eOR" [f3])
 +(define-key xterm-function-map "\eOS" [f4])
 +
 +(define-key xterm-function-map "\eO2P" [S-f1])
 +(define-key xterm-function-map "\eO2Q" [S-f2])
 +(define-key xterm-function-map "\eO2R" [S-f3])
 +(define-key xterm-function-map "\eO2S" [S-f4])
 +(define-key xterm-function-map "\e[15;2~" [S-f5])
 +(define-key xterm-function-map "\e[17;2~" [S-f6])
 +(define-key xterm-function-map "\e[18;2~" [S-f7])
 +(define-key xterm-function-map "\e[19;2~" [S-f8])
 +(define-key xterm-function-map "\e[20;2~" [S-f9])
 +(define-key xterm-function-map "\e[21;2~" [S-f10])
 +(define-key xterm-function-map "\e[23;2~" [S-f11])
 +(define-key xterm-function-map "\e[24;2~" [S-f12])
 +
 +(define-key xterm-function-map "\eO5P" [C-f1])
 +(define-key xterm-function-map "\eO5Q" [C-f2])
 +(define-key xterm-function-map "\eO5R" [C-f3])
 +(define-key xterm-function-map "\eO5S" [C-f4])
 +(define-key xterm-function-map "\e[15;5~" [C-f5])
 +(define-key xterm-function-map "\e[17;5~" [C-f6])
 +(define-key xterm-function-map "\e[18;5~" [C-f7])
 +(define-key xterm-function-map "\e[19;5~" [C-f8])
 +(define-key xterm-function-map "\e[20;5~" [C-f9])
 +(define-key xterm-function-map "\e[21;5~" [C-f10])
 +(define-key xterm-function-map "\e[23;5~" [C-f11])
 +(define-key xterm-function-map "\e[24;5~" [C-f12])
 +
 +(define-key xterm-function-map "\eO6P" [C-S-f1])
 +(define-key xterm-function-map "\eO6Q" [C-S-f2])
 +(define-key xterm-function-map "\eO6R" [C-S-f3])
 +(define-key xterm-function-map "\eO6S" [C-S-f4])
 +(define-key xterm-function-map "\e[15;6~" [C-S-f5])
 +(define-key xterm-function-map "\e[17;6~" [C-S-f6])
 +(define-key xterm-function-map "\e[18;6~" [C-S-f7])
 +(define-key xterm-function-map "\e[19;6~" [C-S-f8])
 +(define-key xterm-function-map "\e[20;6~" [C-S-f9])
 +(define-key xterm-function-map "\e[21;6~" [C-S-f10])
 +(define-key xterm-function-map "\e[23;6~" [C-S-f11])
 +(define-key xterm-function-map "\e[24;6~" [C-S-f12])
 +
 +(define-key xterm-function-map "\eO3P" [A-f1])
 +(define-key xterm-function-map "\eO3Q" [A-f2])
 +(define-key xterm-function-map "\eO3R" [A-f3])
 +(define-key xterm-function-map "\eO3S" [A-f4])
 +(define-key xterm-function-map "\e[15;3~" [A-f5])
 +(define-key xterm-function-map "\e[17;3~" [A-f6])
 +(define-key xterm-function-map "\e[18;3~" [A-f7])
 +(define-key xterm-function-map "\e[19;3~" [A-f8])
 +(define-key xterm-function-map "\e[20;3~" [A-f9])
 +(define-key xterm-function-map "\e[21;3~" [A-f10])
 +(define-key xterm-function-map "\e[23;3~" [A-f11])
 +(define-key xterm-function-map "\e[24;3~" [A-f12])
 +
 +(define-key xterm-function-map "\e[1;2A" [S-up])
 +(define-key xterm-function-map "\e[1;2B" [S-down])
 +(define-key xterm-function-map "\e[1;2C" [S-right])
 +(define-key xterm-function-map "\e[1;2D" [S-left])
 +(define-key xterm-function-map "\e[1;2F" [S-end])
 +(define-key xterm-function-map "\e[1;2H" [S-home])
 +
 +(define-key xterm-function-map "\e[1;5A" [C-up])
 +(define-key xterm-function-map "\e[1;5B" [C-down])
 +(define-key xterm-function-map "\e[1;5C" [C-right])
 +(define-key xterm-function-map "\e[1;5D" [C-left])
 +(define-key xterm-function-map "\e[1;5F" [C-end])
 +(define-key xterm-function-map "\e[1;5H" [C-home])
 +
 +(define-key xterm-function-map "\e[1;6A" [C-S-up])
 +(define-key xterm-function-map "\e[1;6B" [C-S-down])
 +(define-key xterm-function-map "\e[1;6C" [C-S-right])
 +(define-key xterm-function-map "\e[1;6D" [C-S-left])
 +(define-key xterm-function-map "\e[1;6F" [C-S-end])
 +(define-key xterm-function-map "\e[1;6H" [C-S-home])
 +
 +(define-key xterm-function-map "\e[1;3A" [A-up])
 +(define-key xterm-function-map "\e[1;3B" [A-down])
 +(define-key xterm-function-map "\e[1;3C" [A-right])
 +(define-key xterm-function-map "\e[1;3D" [A-left])
 +(define-key xterm-function-map "\e[1;3F" [A-end])
 +(define-key xterm-function-map "\e[1;3H" [A-home])
 +
 +(define-key xterm-function-map "\e[2;2~" [S-insert])
 +(define-key xterm-function-map "\e[3;2~" [S-delete])
 +(define-key xterm-function-map "\e[5;2~" [S-prior])
 +(define-key xterm-function-map "\e[6;2~" [S-next])
 +
 +(define-key xterm-function-map "\e[2;5~" [C-insert])
 +(define-key xterm-function-map "\e[3;5~" [C-delete])
 +(define-key xterm-function-map "\e[5;5~" [C-prior])
 +(define-key xterm-function-map "\e[6;5~" [C-next])
 +
 +(define-key xterm-function-map "\e[2;6~" [C-S-insert])
 +(define-key xterm-function-map "\e[3;6~" [C-S-delete])
 +(define-key xterm-function-map "\e[5;6~" [C-S-prior])
 +(define-key xterm-function-map "\e[6;6~" [C-S-next])
 +
 +(define-key xterm-function-map "\e[2;3~" [A-insert])
 +(define-key xterm-function-map "\e[3;3~" [A-delete])
 +(define-key xterm-function-map "\e[5;3~" [A-prior])
 +(define-key xterm-function-map "\e[6;3~" [A-next])
 +
 +(define-key xterm-function-map "\eOA" [up])
 +(define-key xterm-function-map "\eOB" [down])
 +(define-key xterm-function-map "\eOC" [right])
 +(define-key xterm-function-map "\eOD" [left])
 +(define-key xterm-function-map "\eOF" [end])
 +(define-key xterm-function-map "\eOH" [home])
 +
 +(define-key xterm-function-map "\eO2A" [S-up])
 +(define-key xterm-function-map "\eO2B" [S-down])
 +(define-key xterm-function-map "\eO2C" [S-right])
 +(define-key xterm-function-map "\eO2D" [S-left])
 +(define-key xterm-function-map "\eO2F" [S-end])
 +(define-key xterm-function-map "\eO2H" [S-home])
 +
 +(define-key xterm-function-map "\eO5A" [C-up])
 +(define-key xterm-function-map "\eO5B" [C-down])
 +(define-key xterm-function-map "\eO5C" [C-right])
 +(define-key xterm-function-map "\eO5D" [C-left])
 +(define-key xterm-function-map "\eO5F" [C-end])
 +(define-key xterm-function-map "\eO5H" [C-home])
 +
 +;; Use inheritance to let the main keymap override those defaults.
 +;; This way we don't override terminfo-derived settings or settings
 +;; made in the .emacs file.
 +(unless (let ((map (keymap-parent function-key-map))
 +            found)
 +        (while (and (not found) map)
 +          (setq found (eq xterm-function-map map)
 +                map (keymap-parent map)))
 +        found)
 +  (set-keymap-parent xterm-function-map (keymap-parent function-key-map))
 +  (set-keymap-parent function-key-map xterm-function-map))
  
- ;;; The terminal intialization C code file might have initialized
- ;;; function keys F13->F60 from the termcap/terminfo information.  On
- ;;; a PC-style keyboard these keys correspond to
- ;;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-.  The
- ;;; code here subsitutes the corresponding defintions in
- ;;; function-key-map. This substitution is needed because if a key
- ;;; definition if found in function-key-map, there are no further
- ;;; lookups in other keymaps.
- (substitute-key-definition [f13] [S-f1] function-key-map) 
- (substitute-key-definition [f14] [S-f2] function-key-map)
- (substitute-key-definition [f15] [S-f3] function-key-map)
- (substitute-key-definition [f16] [S-f4] function-key-map)
- (substitute-key-definition [f17] [S-f5] function-key-map)
- (substitute-key-definition [f18] [S-f6] function-key-map)
- (substitute-key-definition [f19] [S-f7] function-key-map)
- (substitute-key-definition [f20] [S-f8] function-key-map)
- (substitute-key-definition [f21] [S-f9] function-key-map)
- (substitute-key-definition [f22] [S-f10] function-key-map)
- (substitute-key-definition [f23] [S-f11] function-key-map)
- (substitute-key-definition [f24] [S-f12] function-key-map)
- 
- (substitute-key-definition [f25] [C-f1] function-key-map) 
- (substitute-key-definition [f26] [C-f2] function-key-map)
- (substitute-key-definition [f27] [C-f3] function-key-map)
- (substitute-key-definition [f28] [C-f4] function-key-map)
- (substitute-key-definition [f29] [C-f5] function-key-map)
- (substitute-key-definition [f30] [C-f6] function-key-map)
- (substitute-key-definition [f31] [C-f7] function-key-map)
- (substitute-key-definition [f32] [C-f8] function-key-map)
- (substitute-key-definition [f33] [C-f9] function-key-map)
- (substitute-key-definition [f34] [C-f10] function-key-map)
- (substitute-key-definition [f35] [C-f11] function-key-map)
- (substitute-key-definition [f36] [C-f12] function-key-map)
- 
- (substitute-key-definition [f37] [C-S-f1] function-key-map) 
- (substitute-key-definition [f38] [C-S-f2] function-key-map)
- (substitute-key-definition [f39] [C-S-f3] function-key-map)
- (substitute-key-definition [f40] [C-S-f4] function-key-map)
- (substitute-key-definition [f41] [C-S-f5] function-key-map)
- (substitute-key-definition [f42] [C-S-f6] function-key-map)
- (substitute-key-definition [f43] [C-S-f7] function-key-map)
- (substitute-key-definition [f44] [C-S-f8] function-key-map)
- (substitute-key-definition [f45] [C-S-f9] function-key-map)
- (substitute-key-definition [f46] [C-S-f10] function-key-map)
- (substitute-key-definition [f47] [C-S-f11] function-key-map)
- (substitute-key-definition [f48] [C-S-f12] function-key-map)
- 
- (substitute-key-definition [f49] [A-f1] function-key-map) 
- (substitute-key-definition [f50] [A-f2] function-key-map)
- (substitute-key-definition [f51] [A-f3] function-key-map)
- (substitute-key-definition [f52] [A-f4] function-key-map)
- (substitute-key-definition [f53] [A-f5] function-key-map)
- (substitute-key-definition [f54] [A-f6] function-key-map)
- (substitute-key-definition [f55] [A-f7] function-key-map)
- (substitute-key-definition [f56] [A-f8] function-key-map)
- (substitute-key-definition [f57] [A-f9] function-key-map)
- (substitute-key-definition [f58] [A-f10] function-key-map)
- (substitute-key-definition [f59] [A-f11] function-key-map)
- (substitute-key-definition [f60] [A-f12] function-key-map)
- 
  ;; Set up colors, for those versions of xterm that support it.
  (defvar xterm-standard-colors
    ;; The names in the comments taken from XTerm-col.ad in the xterm

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index 9afcab1,3e75102..e78b51d
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -1280,12 -1295,12 +1280,12 @@@ command_loop (
      while (1)
        {
        internal_catch (Qtop_level, top_level_1, Qnil);
 -      /* Reset single_kboard in case top-level set it while
 -         evaluating an -f option, or we are stuck there for some
 -         other reason.  */
 -      any_kboard_state ();
 +        /* Reset single_kboard in case top-level set it while
 +           evaluating an -f option, or we are stuck there for some
 +           other reason. */
 +        any_kboard_state ();
        internal_catch (Qtop_level, command_loop_2, Qnil);
-       executing_macro = Qnil;
+       executing_kbd_macro = Qnil;
  
        /* End of file in -batch run causes exit here.  */
        if (noninteractive)

diff --cc src/xdisp.c
Simple merge

diff --cc src/xmenu.c
Simple merge