Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-266
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-267
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-268
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-269
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-270
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-271
   Rename "field-at-point" to "field-at-pos"

 * emacs@sv.gnu.org/emacs--devo--0--patch-272
   (comint-insert-input): Remove redundant calls to setq and goto-char

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

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/env.el
Simple merge

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/ldefs-boot.el
Simple merge

diff --cc lisp/server.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/mac-win.el
Simple merge

diff --cc lisp/term/xterm.el
index 049d65c62fa8cd655c97c3123ddaa78e3a0a22a6,9ce9f34da9661d8ffb3fb6838197cba5a1b431d3..2bf36283983c884b83df925f0bdc1ae90b753736
--- 1/lisp/term/xterm.el
--- 2/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@@ -27,167 -27,6 +27,175 @@@
  
  ;;; Code:
  
 +(defvar xterm-function-map nil
 +  "Function key map overrides for xterm.")
 +
 +;; Make reloads faster.
 +(unless xterm-function-map
 +  (setq xterm-function-map (make-sparse-keymap))
 +  ;; xterm from X.org 6.8.2 uses these key definitions.
 +  (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 "\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 "\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 "\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 "\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~" [insert])
 +  (define-key xterm-function-map "\e[3~" [delete])
 +  (define-key xterm-function-map "\e[5~" [prior])
 +  (define-key xterm-function-map "\e[6~" [next])
 +
 +  (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 "\e[4~" [select])
 +  (define-key xterm-function-map "\e[29~" [print])
 +
++  ;; These keys will be available xterm starting probably from
++  ;; version 214.
++  (define-key xterm-function-map "\e[27;5;8~"  [(control ?\t)])
++  (define-key xterm-function-map "\e[27;5;44~" [(control ?\,)])
++  (define-key xterm-function-map "\e[27;5;46~" [(control ?\.)])
++  (define-key xterm-function-map "\e[27;5;47~" [(control ?\/)])
++  (define-key xterm-function-map "\e[27;5;92~" [(control ?\\)])
++
 +  ;; Other versions of xterm might emit these.
 +  (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[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[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]))
 +
  (defun terminal-init-xterm ()
    "Terminal initialization function for xterm."
    ;; rxvt terminals sometimes set the TERM variable to "xterm", but

diff --cc man/emacs.texi
Simple merge

diff --cc src/.gdbinit
Simple merge

diff --cc src/callproc.c
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/coding.h
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/xdisp.c
Simple merge