Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-280
   Update etc/MORE.STUFF.

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-283
   Merge from gnus--rel--5.10

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

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-101
   Update from CVS

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

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

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

diff --cc lisp/server.el
index 7835c56c3e231b50c1e2e79ee1c69248e90469c1,d20caf34f79da68263ec66b8d71e211a30e91e8a..1f33a5525751f3df1a7535e71b01404d4dbaf682
--- 1/lisp/server.el
--- 2/lisp/server.el
+++ b/lisp/server.el
@@@ -401,53 -246,39 +401,54 @@@ Creates the directory if necessary and 
  (defun server-start (&optional leave-dead)
    "Allow this Emacs process to be a server for client processes.
  This starts a server communications subprocess through which
 -client \"editors\" can send your editing commands to this Emacs job.
 -To use the server, set up the program `emacsclient' in the
 +client \"editors\" can send your editing commands to this Emacs
 +job.  To use the server, set up the program `emacsclient' in the
  Emacs distribution as your standard \"editor\".
  
 -Prefix arg means just kill any existing server communications subprocess."
 +Prefix arg LEAVE-DEAD means just kill any existing server
 +communications subprocess."
    (interactive "P")
 -  ;; kill it dead!
 -  (if server-process
 -      (condition-case () (delete-process server-process) (error nil)))
 -  ;; Delete the socket files made by previous server invocations.
 -  (condition-case ()
 -      (delete-file (expand-file-name server-name server-socket-dir))
 -    (error nil))
 -  ;; If this Emacs already had a server, clear out associated status.
 -  (while server-clients
 -    (let ((buffer (nth 1 (car server-clients))))
 -      (server-buffer-done buffer)))
 -  ;; Now any previous server is properly stopped.
 -  (unless leave-dead
 -    ;; Make sure there is a safe directory in which to place the socket.
 -    (server-ensure-safe-dir server-socket-dir)
 +  (when (or
 +       (not server-clients)
 +       (yes-or-no-p
 +        "The current server still has clients; delete them? "))
 +    ;; It is safe to get the user id now.
 +    (setq server-socket-dir (or server-socket-dir
 +                              (format "/tmp/emacs%d" (user-uid))))
-     ;; Make sure there is a safe directory in which to place the socket.
-     (server-ensure-safe-dir server-socket-dir)
 +    ;; kill it dead!
      (if server-process
 -      (server-log (message "Restarting server")))
 -    (letf (((default-file-modes) ?\700))
 -      (setq server-process
 -          (make-network-process
 -           :name "server" :family 'local :server t :noquery t
 -           :service (expand-file-name server-name server-socket-dir)
 -           :sentinel 'server-sentinel :filter 'server-process-filter
 -           ;; We must receive file names without being decoded.
 -           ;; Those are decoded by server-process-filter according
 -           ;; to file-name-coding-system.
 -           :coding 'raw-text)))))
 +      (condition-case () (delete-process server-process) (error nil)))
 +    ;; Delete the socket files made by previous server invocations.
 +    (condition-case ()
 +      (delete-file (expand-file-name server-name server-socket-dir))
 +      (error nil))
 +    ;; If this Emacs already had a server, clear out associated status.
 +    (while server-clients
 +      (server-delete-client (car server-clients)))
++    ;; Now any previous server is properly stopped.
 +    (if leave-dead
 +      (progn
 +        (server-log (message "Server stopped"))
 +        (setq server-process nil))
++      ;; Make sure there is a safe directory in which to place the socket.
++      (server-ensure-safe-dir server-socket-dir)
 +      (if server-process
 +        (server-log (message "Restarting server"))
 +      (server-log (message "Starting server")))
 +      (letf (((default-file-modes) ?\700))
 +      (add-hook 'suspend-tty-functions 'server-handle-suspend-tty)
 +      (add-hook 'delete-frame-functions 'server-handle-delete-frame)
 +      (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
 +      (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
 +      (setq server-process
 +            (make-network-process
 +             :name "server" :family 'local :server t :noquery t
 +             :service (expand-file-name server-name server-socket-dir)
 +             :sentinel 'server-sentinel :filter 'server-process-filter
 +             ;; We must receive file names without being decoded.
 +             ;; Those are decoded by server-process-filter according
 +             ;; to file-name-coding-system.
 +             :coding 'raw-text))))))
  
  ;;;###autoload
  (define-minor-mode server-mode
@@@ -1113,10 -638,7 +1114,10 @@@ only these files will be asked to be sa
  (define-key ctl-x-map "#" 'server-edit)
  
  (defun server-unload-hook ()
-   (server-start t)
 +  "Unload the server library."
+   (server-mode -1)
 +  (remove-hook 'suspend-tty-functions 'server-handle-suspend-tty)
 +  (remove-hook 'delete-frame-functions 'server-handle-delete-frame)
    (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
    (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
    (remove-hook 'kill-buffer-hook 'server-kill-buffer))

diff --cc lisp/simple.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 2bf36283983c884b83df925f0bdc1ae90b753736,6e6c75ade42b32f92a9ce497a7b169d89c80d8a3..5a32e7c15e9719b5e295197b68bd252fe012e432
--- 1/lisp/term/xterm.el
--- 2/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@@ -27,175 -27,6 +27,175 @@@
  
  ;;; Code:
  
-   (define-key xterm-function-map "\e[27;5;8~"  [(control ?\t)])
 +(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;9~"  [(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 src/.arch-inventory
index 69aac5da9e46d2d8b7f9f2a9f3d3966b4488169f,fe99529135fc31e8a021122bb8073afa681943ad..c21e38d47d7928dec2e0c4d5a7e3154e7dfbb8a1
--- 1/src/.arch-inventory
--- 2/src/.arch-inventory
+++ b/src/.arch-inventory
@@@ -2,10 -2,8 +2,11 @@@
  source ^\.(gdbinit|dbxinit)$
  
  # Auto-generated files, which ignore
- precious ^(config\.stamp|config\.h|epaths\.h|TAGS-LISP)$
+ precious ^(config\.stamp|config\.h|epaths\.h|buildobj\.lst)$
++precious ^(TAGS-LISP)$
 +precious ^(buildobj\.lst)$
  
  backup ^(stamp-oldxmenu|prefix-args|temacs|emacs|emacs-[0-9.]*)$
 +backup ^(bootstrap-emacs)$
  
  # arch-tag: 277cc7ae-b3f5-44af-abf1-84c073164543

diff --cc src/Makefile.in
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lread.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/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xterm.c
Simple merge