Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc lisp/emulation/cua-base.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/ldefs-boot.el
index 697c662bf3c305fed61b0657072d9d1a8e1c1f4f,90994d3b14dcb0abb2a548300775ad1d550550ba..923b309a1dda3245e31fd822fca77ca7e235b2db
--- 1/lisp/ldefs-boot.el
--- 2/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@@ -524,7 -524,7 +524,7 @@@ A replacement function for `newline-and
  ;;;***
  \f
  ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el"
- ;;;;;;  (17888 32278))
 -;;;;;;  (17892 53245))
++;;;;;;  (17963 18444))
  ;;; Generated autoloads from allout.el
  
  (put (quote allout-show-bodies) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil)))))))
@@@ -5542,7 -5529,7 +5545,7 @@@ INHERIT-INPUT-METHOD
  ;;;***
  \f
  ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
- ;;;;;;  (17888 32279))
 -;;;;;;  (17889 58740))
++;;;;;;  (17963 18438))
  ;;; Generated autoloads from emulation/cua-base.el
  
  (defvar cua-mode nil "\
@@@ -6520,7 -6507,7 +6523,7 @@@ as well as widgets, buttons, overlays, 
  ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
  ;;;;;;  desktop-load-default desktop-read desktop-remove desktop-save
  ;;;;;;  desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
- ;;;;;;  "desktop.el" (17888 32279))
 -;;;;;;  "desktop.el" (17893 52879))
++;;;;;;  "desktop.el" (17963 18446))
  ;;; Generated autoloads from desktop.el
  
  (defvar desktop-save-mode nil "\
@@@ -10732,7 -10695,7 +10735,7 @@@ Unconditionally turn on Fast Lock mode
  \f
  ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
  ;;;;;;  feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
- ;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17888 32266))
 -;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17889 58740))
++;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (17963 18438))
  ;;; Generated autoloads from mail/feedmail.el
  
  (autoload (quote feedmail-send-it) "feedmail" "\
@@@ -11233,7 -11196,7 +11236,7 @@@ Define some key bindings for the find-f
  ;;;***
  \f
  ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
- ;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17888 32279))
 -;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17893 52879))
++;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (17963 18447))
  ;;; Generated autoloads from find-lisp.el
  
  (autoload (quote find-lisp-find-dired) "find-lisp" "\
@@@ -11676,7 -11639,7 +11679,7 @@@ and choose the directory as the fortune
  ;;;***
  \f
  ;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el"
- ;;;;;;  (17888 36650))
 -;;;;;;  (17893 64381))
++;;;;;;  (17963 18447))
  ;;; Generated autoloads from progmodes/gdb-ui.el
  
  (autoload (quote gdba) "gdb-ui" "\
@@@ -12820,8 -12783,8 +12823,8 @@@ the form \"WINDOW-ID PIXMAP-ID\".  Valu
  
  ;;;***
  \f
- ;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx
- ;;;;;;  sdb gdb) "gud" "progmodes/gud.el" (17888 36930))
+ ;;;### (autoloads (gdb-script-mode jdb pdb perldb xdb dbx sdb gdb)
 -;;;;;;  "gud" "progmodes/gud.el" (17892 21082))
++;;;;;;  "gud" "progmodes/gud.el" (17963 18441))
  ;;; Generated autoloads from progmodes/gud.el
  
  (autoload (quote gdb) "gud" "\
@@@ -14710,8 -14638,8 +14706,8 @@@ The main features of this mode ar
  ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
  ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
  ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
- ;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17888
- ;;;;;;  36648))
 -;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17892
 -;;;;;;  21082))
++;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17963
++;;;;;;  18439))
  ;;; Generated autoloads from ido.el
  
  (defvar ido-mode nil "\
@@@ -17682,7 -17511,7 +17678,7 @@@ turn on menu bars; otherwise, turn off 
  ;;;;;;  message-cite-function message-yank-prefix message-citation-line-function
  ;;;;;;  message-send-mail-function message-user-organization-file
  ;;;;;;  message-signature-separator message-from-style) "message"
- ;;;;;;  "gnus/message.el" (17888 32279))
 -;;;;;;  "gnus/message.el" (17843 27874))
++;;;;;;  "gnus/message.el" (17963 18449))
  ;;; Generated autoloads from gnus/message.el
  
  (defvar message-from-style (quote default) "\
@@@ -18884,7 -18713,7 +18880,7 @@@ Enable mouse wheel support
  ;;;### (autoloads (network-connection network-connection-to-service
  ;;;;;;  whois-reverse-lookup whois finger ftp run-dig dns-lookup-host
  ;;;;;;  nslookup nslookup-host route arp netstat ipconfig ping traceroute)
- ;;;;;;  "net-utils" "net/net-utils.el" (17888 32280))
 -;;;;;;  "net-utils" "net/net-utils.el" (17892 21082))
++;;;;;;  "net-utils" "net/net-utils.el" (17963 18441))
  ;;; Generated autoloads from net/net-utils.el
  
  (autoload (quote traceroute) "net-utils" "\
@@@ -19506,12 -19313,12 +19502,12 @@@ The Custom feature is intended to make 
  ;;;***
  \f
  ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
- ;;;;;;  org-export-icalendar-this-file orgtbl-mode turn-on-orgtbl
- ;;;;;;  org-remember-handler org-remember-apply-template org-remember-annotation
- ;;;;;;  org-store-link org-tags-view org-diary org-cycle-agenda-files
- ;;;;;;  org-todo-list org-agenda-list org-batch-agenda org-agenda
+ ;;;;;;  org-export-icalendar-this-file org-diary org-tags-view org-todo-list
+ ;;;;;;  org-agenda-list org-cycle-agenda-files org-batch-agenda org-agenda
+ ;;;;;;  org-remember-handler org-remember org-remember-apply-template
+ ;;;;;;  org-remember-annotation org-store-link orgtbl-mode turn-on-orgtbl
  ;;;;;;  org-global-cycle org-cycle org-mode) "org" "textmodes/org.el"
- ;;;;;;  (17888 36930))
 -;;;;;;  (17894 62281))
++;;;;;;  (17963 18455))
  ;;; Generated autoloads from textmodes/org.el
  
  (autoload (quote org-mode) "org" "\
@@@ -21462,8 -21276,8 +21465,8 @@@ Not documente
  ;;;;;;  ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
  ;;;;;;  ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
  ;;;;;;  ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type
- ;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17888
- ;;;;;;  36936))
 -;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17895
 -;;;;;;  22419))
++;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (17963
++;;;;;;  18455))
  ;;; Generated autoloads from ps-print.el
  
  (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\
@@@ -21660,7 -21474,7 +21663,7 @@@ If EXTENSION is any other symbol, it i
  ;;;***
  \f
  ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
- ;;;;;;  (17888 32281))
 -;;;;;;  (17894 62280))
++;;;;;;  (17963 18448))
  ;;; Generated autoloads from progmodes/python.el
  
  (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode)))
@@@ -22662,8 -22476,8 +22665,8 @@@ variable
  ;;;;;;  rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output
  ;;;;;;  rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers
  ;;;;;;  rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names
- ;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17888
- ;;;;;;  32280))
 -;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17889
 -;;;;;;  58740))
++;;;;;;  rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17963
++;;;;;;  18438))
  ;;; Generated autoloads from mail/rmail.el
  
  (autoload (quote rmail-movemail-variant-p) "rmail" "\
@@@ -26598,7 -26315,7 +26601,7 @@@ Start coverage on function under point
  
  ;;;***
  \f
- ;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17888 32281))
 -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17852 64479))
++;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17963 18455))
  ;;; Generated autoloads from play/tetris.el
  
  (autoload (quote tetris) "tetris" "\
@@@ -27969,7 -27681,7 +27972,7 @@@ BUFFER defaults to `trace-buffer'
  ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
  ;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
  ;;;;;;  tramp-file-name-handler tramp-completion-file-name-regexp
- ;;;;;;  tramp-file-name-regexp) "tramp" "net/tramp.el" (17888 36931))
 -;;;;;;  tramp-file-name-regexp) "tramp" "net/tramp.el" (17893 65071))
++;;;;;;  tramp-file-name-regexp) "tramp" "net/tramp.el" (17963 18447))
  ;;; Generated autoloads from net/tramp.el
  
  (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\
@@@ -28228,8 -27940,8 +28231,8 @@@ easy-to-use form
  
  ;;;***
  \f
- ;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17888
- ;;;;;;  36587))
 -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17893
 -;;;;;;  52880))
++;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17963
++;;;;;;  18445))
  ;;; Generated autoloads from tutorial.el
  
  (autoload (quote help-with-tutorial) "tutorial" "\
@@@ -31225,7 -30937,7 +31228,7 @@@ Zone out, completely
  ;;;;;;  "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el"
  ;;;;;;  "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el"
  ;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el"
- ;;;;;;  "x-dnd.el") (17888 39099 529730))
 -;;;;;;  "x-dnd.el") (17895 22686 433097))
++;;;;;;  "x-dnd.el") (17963 18741 697794))
  
  ;;;***
  \f

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/version.el
Simple merge

diff --cc lwlib/xlwmenu.c
Simple merge

diff --cc src/.gdbinit
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/process.c
Simple merge