Merged from miles@gnu.org--gnu-2005 (patch 34-36, 142-158)

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-145
   (make-text-button): Default button type if not specified

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-146
   quick-install-emacs: Use mkdir --verbose only when requested

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
   Add info/dir to arch branch

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

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

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

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

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

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

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

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

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

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

diff --cc lisp/frame.el
index 0fa10babf125fa5f336e9464c6482d3a02205c38,e7cf62ef708e8cbe6d21d1fc32547765eeb0a4fa..25cc5aa38c830310c0a96bb0af8eb7c6540554db
--- 1/lisp/frame.el
--- 2/lisp/frame.el
+++ b/lisp/frame.el
@@@ -1341,9 -1270,9 +1341,9 @@@ Note that this command is effective onl
  displays through a window system, because then Emacs does its own
  cursor display.  On a text-only terminal, this is not implemented."
    :init-value (not (or noninteractive
-                      emacs-quick-startup
+                      (if (boundp 'no-blinking-cursor) no-blinking-cursor)
                       (eq system-type 'ms-dos)
 -                     (not (memq window-system '(x w32)))))
 +                     (not (memq initial-window-system '(x w32)))))
    :group 'cursor
    :global t
    (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))

diff --cc lisp/progmodes/gdb-ui.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
index b66ceb38ea1648c284966443bb06a9fe9d319348,1c5616f8823dbdb03eba4957aee8179492fca40f..b16cfdeb0c91579198b0415051f642b51a1d3438
--- 1/lisp/startup.el
--- 2/lisp/startup.el
+++ b/lisp/startup.el
@@@ -747,9 -746,9 +753,9 @@@ opening the first frame (e.g. open a co
    ;; you should also change the corresponding expression in the
    ;; defcustom in frame.el, or Custom will be badly confused.
    (unless (or noninteractive
-             emacs-quick-startup
+             no-blinking-cursor
                (eq system-type 'ms-dos)
 -              (not (memq window-system '(x w32))))
 +              (not (memq initial-window-system '(x w32))))
      (blink-cursor-mode 1))
  
    (unless noninteractive

diff --cc mac/makefile.MPW
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/xdisp.c
Simple merge