Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-616
   Add lisp/mh-e/.arch-inventory

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-624
   Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.

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

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

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

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

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

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

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

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

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

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

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

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

7 files changed, 52 insertions, 17 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index cb0b68f7f01..37219982320 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,18 @@
+2005-10-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * e/eterm-color.ti (el1): Undo 2005-10-23 change. 
+        Add some comments on how to update this file. Add ri 
+        capability that has long been supported by term.el.
+
+2005-10-25  Nick Roberts  <nickrob@snap.net.nz>
+
+        * images/gud/until.xpm: Colour correction.
+
+2005-10-23  Richard M. Stallman  <rms@gnu.org>
+
+        * e/eterm-color.ti (el1): Capability deleted,
+        since term.el doesn't implement it.
+
 2005-10-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * e/eterm-color.ti: Change the terminal name to eterm-color.
diff --git a/etc/NEWS b/etc/NEWS
index e21f74a0216..f342dc9e328 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1284,8 +1284,8 @@ read-only properties, if it is safe to do so.  This means that if any
 part of a prompt is deleted, then the entire prompt must be deleted
 and that all prompts must stay at the beginning of a line.  If this is
 not the case, then `comint-kill-region' behaves just like
-`kill-region' if read-only are involved: it copies the text to the
-kill-ring, but does not delete it.
+`kill-region' if read-only properties are involved: it copies the text
+to the kill-ring, but does not delete it.
 
 +++
 *** The new command `comint-insert-previous-argument' in comint-derived
@@ -1522,6 +1522,7 @@ separate manual.
 
 +++
 ** savehist saves minibuffer histories between sessions.
+To use this feature, put (savehist-load) in your `.emacs' file.
 
 +++
 ** Filesets are collections of files.  You can define a fileset in
@@ -1823,15 +1824,16 @@ powerful ways.
 
 *** many substantial fixes and refinements, including:
 
-   - repaired inhibition of inadvertant edits to concealed text
+   - repaired inhibition of inadvertent edits to concealed text
    - repaired retention of topic body hanging indent upon topic depth shifts
    - prevent "containment discontinuities" where a topic is shifted deeper
-     than the offspring-depth of its' container
+     than the offspring-depth of its container
    - easy to adopt the distinctive bullet of a topic in a topic created
      relative to it, or select a new one, or use the common topic bullet
    - plain bullets, by default, now alternate between only two characters
-     ('.' and ','), yielding less cluttered outlines.
-   - many internal fixes.
+     ('.' and ','), yielding less cluttered outlines
+   - many internal fixes
+   - version number incremented to 2.1
 
 ** The variable `woman-topic-at-point' was renamed
 to `woman-use-topic-at-point' and behaves differently: if this
@@ -3475,6 +3477,13 @@ It returns nil if the given Lisp form can't possibly do anything
 dangerous; otherwise it returns a reason why the form might be unsafe
 (calls unknown function, alters global variable, etc).
 
++++
+*** New macro `eval-at-startup' specifies expressions to
+evaluate when Emacs starts up.  If this is done after startup,
+it evaluates those expressions immediately.
+
+This is useful in packages that can be preloaded. 
+
 *** `list-faces-display' takes an optional argument, REGEXP.
 
 If it is non-nil, the function lists only faces matching this regexp.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 3b9dc6b17ff..76a62dca178 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2007,7 +2007,13 @@ A certain X server for Windows had a bug which caused this.
 Supposedly the newer 32-bit version of this server doesn't have the
 problem.
 
-** Known problems with the MS-Windows port of Emacs 21.2.
+** Known problems with the MS-Windows port of Emacs 22.1
+
+Using create-fontset-from-ascii-font or the --font startup parameter
+with a Chinese, Japanese or Korean font leads to display problems.
+Use a Latin-only font as your default font. If you want control over
+which font is used to display Chinese, Japanese or Korean character,
+use create-fontset-from-fontset-spec to define a fontset.
 
 Frames are not refreshed while the File or Font dialog or a pop-up menu
 is displayed. This also means help text for pop-up menus is not
@@ -2027,13 +2033,10 @@ after moving back into it.
 Some minor flickering still persists during mouse-tracking, although
 not as severely as in 21.1.
 
-Emacs can sometimes abort when non-ASCII text, possibly with null
-characters, is copied and pasted into a buffer.
-
 An inactive cursor remains in an active window after the Windows
 Manager driven switch of the focus, until a key is pressed.
 
-Windows input methods are not recognized by Emacs (as of v21.2).  Some
+Windows input methods are not recognized by Emacs.  Some
 of these input methods cause the keyboard to send characters encoded
 in the appropriate coding system (e.g., ISO 8859-1 for Latin-1
 characters, ISO 8859-8 for Hebrew characters, etc.).  To make this
diff --git a/etc/TODO b/etc/TODO
index 2a526681ae5..324b3cf2a0c 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -37,8 +37,8 @@ to the FSF.
 * Important features:
 
 ** Provide user-friendly ways to list all available font families,
-  display a font as a sample, etc.  [fx is looking at multilingual
-  font selection for Emacs 22.]
+   list fonts, display a font as a sample, etc.  [fx is looking at
+  multilingual font selection for Emacs 22.]
 
 ** Program Enriched mode to read and save in RTF.  [Is there actually a
   decent single definition of RTF?  Maybe see info at
@@ -146,6 +146,10 @@ to the FSF.
   Bison input files, for instance, or other kinds of text
   where one language is embedded in another language.
 
+** Arrange a way for an input method to return the first character
+  immediately, then replace it later.  So that C-s a with
+  input method latin-1-postfix would immediately search for an a.
+
 ** Give start-process the ability to direct standard-error
   output to a different filter.
 
@@ -230,7 +234,7 @@ to the FSF.
 
 ** Investigate using the language environment (or locale?) to set up
   more things, such as the default Ispell dictionary, calendar
-  holidays, quoting characters?,...
+  holidays, quoting characters, space after periods and colons, ...
 
 ** Improve the GC (generational, incremental).  (We may be able to use
   the Boehm collector.)  [See the Boehm-GC branch in CVS for work on
@@ -243,8 +247,6 @@ to the FSF.
 ** Provide an optional feature which computes a scroll bar slider's
   size and its position from lines instead of characters.
 
-** Make the Custom themes support do useful things.
-
 ** Add support for SVG (Scalable Vector Graphics) rendering to
   Emacs.
 
diff --git a/etc/e/eterm-color b/etc/e/eterm-color
index de84f4c909c..c9b87e5854f 100644
--- a/etc/e/eterm-color
+++ b/etc/e/eterm-color
diff --git a/etc/e/eterm-color.ti b/etc/e/eterm-color.ti
index ac8b459ef3c..ae38c10014c 100644
--- a/etc/e/eterm-color.ti
+++ b/etc/e/eterm-color.ti
@@ -1,4 +1,9 @@
 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
+# When updating this file, etc/e/eterm-color should be regenerated by 
+# running "make e/eterm-color" in the etc directory.
+# Any change to this file should be done at the same time with a
+# corresponding change to the TERMCAP evironment variable in term.el.
+# Comments in term.el specify where each of these capabilities is implemented.
         colors#8,
         cols#80,
         lines#24,
@@ -47,6 +52,7 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
         op=\E[39;49m,
         rc=\E8,
         rev=\E[7m,
+        ri=\EM,
         rmir=\E[4l,
         rmso=\E[27m,
         rmul=\E[24m,
diff --git a/etc/images/gud/until.xpm b/etc/images/gud/until.xpm
index f82da6700b2..aae32e177a7 100644
--- a/etc/images/gud/until.xpm
+++ b/etc/images/gud/until.xpm
@@ -2,7 +2,7 @@
 static char * goto_xpm[] = {
 "24 24 6 1",
 "       c None",
-".      c #ff0000",
+".      c #cc0033",
 "X      c #616161",
 "o      c #2a1f55",
 "O      c #adadad",