Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)

Patches applied:

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

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

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

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

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

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

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

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

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

3 files changed, 23 insertions, 27 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 49935b9a9b3..0efca03ac29 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * TODO: post-command-idle-hook has gone.
+
+2005-05-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Remove references to open-network-stream-nowait and
+        open-network-stream-server.
+
 2005-05-15  Richard M. Stallman  <rms@gnu.org>
 
         * GNU: Correct/improve previous change.
@@ -97,9 +106,9 @@
         * TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
         * TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
         line.
-        
+
 2005-04-01  Ognyan Kulev  <ogi@fmi.uni-sofia.bg>
-        
+
         * TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
         2005-02-08T14:20:54Z!lute@gnu.org, "Emacs" is not transliterated to cyrillic anymore;
         Minor fixes.
@@ -1846,9 +1855,9 @@
         * emacstool.c: setenv IN_EMACSTOOL=t, TERM=sun, TERMCAP=.
 
         * emacsstool.1: update to document environment variables.
-        
+
 1989-02-21  Mosur Mohan (email@notavailable)
-        
+
         * etags.c (PAS_funcs): New function.
 
 1989-02-21  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
@@ -1873,7 +1882,7 @@
 
 1989-01-19  Sam Kendall  (email@notavailable)
 
-        * etags.c: Greatly rewritten for C++ support and for multiple tags        
+        * etags.c: Greatly rewritten for C++ support and for multiple tags
         per line.
 
 1989-01-03  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
diff --git a/etc/NEWS b/etc/NEWS
index 7061be5d71d..58eaf52fa7b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -819,7 +819,7 @@ trouble with fontification and/or indentation.
 
 *** New standard font-lock face `font-lock-comment-delimiter-face'.
 
-*** Easy to overlook single character negation is now font-locked.
+*** Easy to overlook single character negation can now be font-locked.
 You can use the new variable `font-lock-negation-char-face' and the face of
 the same name to customize this.  Currently the cc-modes, sh-script-mode,
 cperl-mode and make-mode support this.
@@ -1482,7 +1482,7 @@ region (like delete-selection-mode).  Do not enable these modes with
 cua-mode.  Customize the variable `cua-mode' to enable cua.
 
 In addition, cua provides unified rectangle support with visible
-rectangle highlighting: Use S-return to start a rectangle, extend it
+rectangle highlighting: Use C-return to start a rectangle, extend it
 using the movement commands (or mouse-3), and cut or copy it using C-x
 or C-c (using C-w and M-w also works).
 
@@ -2278,8 +2278,9 @@ breakpoints.
 
 Use M-x gdb to start GDB-UI.
 
-*** GUD tooltips can be toggled independently of normal tooltips
-with the minor mode `gud-tooltip-mode'.
+*** The variable tooltip-gud-tips-p has been removed.  GUD tooltips can now be
+toggled independently of normal tooltips with the minor mode
+`gud-tooltip-mode'.
 
 +++
 *** In graphical mode, with a C program, GUD Tooltips have been extended to
@@ -3011,6 +3012,10 @@ the command `undefined'.  (In earlier Emacs versions, it used
 
 ** General Lisp changes:
 
+---
+*** The variables post-command-idle-hook and post-command-idle-delay have
+    been removed.  Use run-with-idle-timer instead.
+
 +++
 *** The function `eql' is now available without requiring the CL package.
 
@@ -3953,21 +3958,6 @@ To test for the availability of a given feature, use featurep like this:
 
 *** The old `open-network-stream' now uses `make-network-process'.
 
-*** New function `open-network-stream-nowait'.
-
-This function initiates a non-blocking connect and returns immediately
-without waiting for the connection to be established.  It takes the
-filter and sentinel functions as arguments; when the non-blocking
-connect completes, the sentinel is called with a status string
-matching "open" or "failed".
-
-*** New function `open-network-stream-server'.
-
-This function creates a network server process for a TCP service.
-When a client connects to the specified service, a new subprocess
-is created to handle the new connection, and the sentinel function
-is called for the new process.
-
 *** New functions `process-datagram-address', `set-process-datagram-address'.
 
 These functions are used with datagram-based network processes to get
diff --git a/etc/TODO b/etc/TODO
index 217fd0469aa..d964a35c1d4 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -9,9 +9,6 @@ to the FSF.
 
 * Small but important fixes needed in existing features:
 
-** Convert everything that uses post-command-idle-hook
-  to use idle timers instead.
-
 ** Fix the kill/yank treatment of invisible text.  At the moment,
   invisible text is placed in the kill-ring, so that the contents of
   the ring may not correspond to the text as displayed to the user. It