Merged from emacs@sv.gnu.org

Patches applied:

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-208
   Sync from erc--emacs--0

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

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

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

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

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

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

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

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

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

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

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

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/startup.el
index a79a0e7516ede68017c595ab6d60ff2c64a613d0,907ae46346209ab948b16a69334368da797750ef..5a35249378bd35ab8bb52fe1888ebbdaf518a9a5
--- 1/lisp/startup.el
--- 2/lisp/startup.el
+++ b/lisp/startup.el
@@@ -1512,35 -1510,41 +1512,41 @@@ Emacs is Free Software--Free as in Free
  of Emacs and modify it; type \\[describe-copying] to see the conditions.
  Type \\[describe-distribution] for information on getting the latest version."))))
  
 -          ;; The rest of the startup screen is the same on all
 -          ;; kinds of terminals.
 -
 -          ;; Give information on recovering, if there was a crash.
 -          (and auto-save-list-file-prefix
 -               ;; Don't signal an error if the
 -               ;; directory for auto-save-list files
 -               ;; does not yet exist.
 -               (file-directory-p (file-name-directory
 -                                  auto-save-list-file-prefix))
 -               (directory-files
 -                (file-name-directory auto-save-list-file-prefix)
 -                nil
 -                (concat "\\`"
 -                        (regexp-quote (file-name-nondirectory
 -                                       auto-save-list-file-prefix)))
 -                t)
 -               (insert "\n\nIf an Emacs session crashed recently, "
 -                       "type M-x recover-session RET\nto recover"
 -                       " the files you were editing."))
 -
 -          ;; Display the input that we set up in the buffer.
 -          (set-buffer-modified-p nil)
 -          (goto-char (point-min))
 +        ;; The rest of the startup screen is the same on all
 +        ;; kinds of terminals.
 +
 +        ;; Give information on recovering, if there was a crash.
 +        (and auto-save-list-file-prefix
 +             ;; Don't signal an error if the
 +             ;; directory for auto-save-list files
 +             ;; does not yet exist.
 +             (file-directory-p (file-name-directory
 +                                auto-save-list-file-prefix))
 +             (directory-files
 +              (file-name-directory auto-save-list-file-prefix)
 +              nil
 +              (concat "\\`"
 +                      (regexp-quote (file-name-nondirectory
 +                                     auto-save-list-file-prefix)))
 +              t)
 +             (insert "\n\nIf an Emacs session crashed recently, "
 +                     "type M-x recover-session RET\nto recover"
 +                     " the files you were editing."))
 +
 +        ;; Display the input that we set up in the buffer.
 +        (set-buffer-modified-p nil)
 +        (goto-char (point-min))
-         (save-window-excursion
-           (switch-to-buffer (current-buffer))
-           (sit-for 120)))
+           (if (or (window-minibuffer-p)
+                   (window-dedicated-p (selected-window)))
+               ;; There's no point is using pop-to-buffer since creating
+               ;; a new frame will generate enough events that the
+               ;; subsequent `sit-for' will immediately return anyway.
+               nil ;; (pop-to-buffer (current-buffer))
+             (save-window-excursion
+               (switch-to-buffer (current-buffer))
+               (sit-for 120))))
 -      ;; Unwind ... ensure splash buffer is killed
 -      (kill-buffer "GNU Emacs"))))
 +    ;; Unwind ... ensure splash buffer is killed
 +    (kill-buffer "GNU Emacs"))))
  
  
  (defun startup-echo-area-message ()

diff --cc man/emacs.texi
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/lisp.h
Simple merge