Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-31
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-32
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-33
   Update from CVS

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

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

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-37
   Update from CVS


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

6 files changed, 95 insertions, 32 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 16e02786542..981fd88ba3a 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,18 @@
+2004-09-26  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * enriched.doc: `enriched-annotation-alist' is now called
+        `enriched-translations'.
+
+2004-09-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * e/eterm.ti: Comment out smcup, rmcup. Add kbs, kdch1, rc, sc.
+        Reformat.
+        * e/eterm: Regenerate.
+
+2004-09-25  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * PROBLEMS: Updated exec-shield description.
+
 2004-09-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * e/eterm.ti: Change the strings for smso and rmso.
diff --git a/etc/NEWS b/etc/NEWS
index 18fb4f5ebd4..84c90016f6f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1409,6 +1409,7 @@ appointments, paydays or anything else using a sexp.
 year and day number, and moves to that date. Negative day numbers
 count backward from the end of the year.
 
+---
 ** The functions `holiday-easter-etc' and `holiday-advent' now take
 arguments, and only report on the specified holiday rather than all.
 This makes customization of the variable `christian-holidays' simpler,
@@ -2254,6 +2255,7 @@ configuration files.
 
 * Lisp Changes in Emacs 21.4
 
++++
 ** Major mode functions now run the new normal hook
 `after-change-major-mode-hook', at their very end, after the mode hooks.
 
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 4a99e351e23..516947245a7 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2329,28 +2329,34 @@ The fix is to install a newer version of ncurses, such as version 4.2.
 *** Linux: Segfault during `make bootstrap' under certain recent versions of the Linux kernel.
 
 With certain recent Linux kernels (like the one of Redhat Fedora Core
-1), the new "Exec-shield" functionality is enabled by default, which
+1 and 2), the new "Exec-shield" functionality is enabled by default, which
 creates a different memory layout that breaks the emacs dumper.
 
+Configure can overcome the problem of exec-shield if the architecture is
+x86 and the program setarch is present.  On other architectures no
+workaround is known.
+
 You can check the Exec-shield state like this:
 
     cat /proc/sys/kernel/exec-shield
 
-It returns 1 or 2 when Exec-shield is enabled, 0 otherwise.  Please
+It returns non-zero when Exec-shield is enabled, 0 otherwise.  Please
 read your system documentation for more details on Exec-shield and
-associated commands.
+associated commands.  Exec-shield can be turned off with this command:
+
+    echo "0" > /proc/sys/kernel/exec-shield
 
 When Exec-shield is enabled, building Emacs will segfault during the
 execution of this command:
 
-temacs --batch --load loadup [dump|bootstrap]
+    ./temacs --batch --load loadup [dump|bootstrap]
 
 To work around this problem, it is necessary to temporarily disable
-Exec-shield while building Emacs, using the `setarch' command like
-this:
+Exec-shield while building Emacs, or, on x86, by using the `setarch'
+command when running temacs like this:
+
+    setarch i386 ./temacs --batch --load loadup [dump|bootstrap]
 
-    setarch i386 ./configure <configure parameters>
-    setarch i386 make <make parameters>
 
 *** Fatal signal in the command  temacs -l loadup inc dump.
 
diff --git a/etc/e/eterm b/etc/e/eterm
index 3c2a82fa956..2658701660b 100644
--- a/etc/e/eterm
+++ b/etc/e/eterm
diff --git a/etc/e/eterm.ti b/etc/e/eterm.ti
index 648ff728518..36576b4db6a 100644
--- a/etc/e/eterm.ti
+++ b/etc/e/eterm.ti
@@ -1,21 +1,61 @@
 eterm,
-        lines#24,cols#80,
-        colors#8,pairs#64,
-        cuu1=\E[A,cud1=\n,cub1=\b,cuf1=\E[C,home=\E[H,cr=\r,
-        cuu=\E[%p1%dA,cud=\E[%p1%dB,cub=\E[%p1%dD,cuf=\E[%p1%dC,
+        colors#8,
+        cols#80,
+        lines#24,
+        pairs#64,
+        am,
+        mir,
+        xenl,
+        bel=^G,
+        bold=\E[1m,
+        clear=\E[H\E[J,
+        cr=\r,
+        csr=\E[%i%p1%d;%p2%dr,
+        cub1=\b,
+        cub=\E[%p1%dD,
+        cud1=\n,
+        cud=\E[%p1%dB,
+        cuf1=\E[C,
+        cuf=\E[%p1%dC,
         cup=\E[%i%p1%d;%p2%dH,
-        ind=\n,csr=\E[%i%p1%d;%p2%dr,
-        il1=\E[L,il=\E[%p1%dL,
-        clear=\E[H\E[J,ed=\E[J,el=\E[K,el1=\E[1K,
-        dl1=\E[M,dl=\E[%p1%dM,dch1=\E[P,dch=\E[%p1%dP,
-        smir=\E[4h,rmir=\E[4l,ich=\E[%p1%d@,mir,
-        smcup=\E7\E[?47h,rmcup=\E[2J\E[?47l\E8,
-        ht=\t,khome=\E[1~,kend=\E[4~,knp=\E[6~,kpp=\E[5~,
-        kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-        smso=\E[7m,rmso=\E[27m,
-        smul=\E[4m,rmul=\E[24m,
-        rev=\E[7m,bold=\E[1m,sgr0=\E[m,
-        invis=\E[8m,op=\E[39;49m,
-        setab=\E[%p1%{40}%+%dm, setaf=\E[%p1%{30}%+%dm,
-        bel=^G,xenl,am,
-
+        cuu1=\E[A,
+        cuu=\E[%p1%dA,
+        dch1=\E[P,
+        dch=\E[%p1%dP,
+        dl1=\E[M,
+        dl=\E[%p1%dM,
+        ed=\E[J,
+        el1=\E[1K,
+        el=\E[K,
+        home=\E[H,
+        ht=\t,
+        ich=\E[%p1%d@,
+        il1=\E[L,
+        il=\E[%p1%dL,
+        ind=\n,
+        invis=\E[8m,
+        kbs=^?,
+        kcub1=\EOD,
+        kcud1=\EOB,
+        kcuf1=\EOC,
+        kcuu1=\EOA,
+        kdch1=\E[3~,
+        kend=\E[4~,
+        khome=\E[1~,
+        knp=\E[6~,
+        kpp=\E[5~,
+        op=\E[39;49m,
+        rc=\E8,
+        rev=\E[7m,
+        rmir=\E[4l,
+        rmso=\E[27m,
+        rmul=\E[24m,
+        sc=\E7,
+        setab=\E[%p1%{40}%+%dm,
+        setaf=\E[%p1%{30}%+%dm,
+        sgr0=\E[m,
+        smir=\E[4h,
+        smul=\E[4m,
+        smso=\E[7m,
+#       smcup=\E[?47h,
+#       rmcup=\E[?47l,
diff --git a/etc/enriched.doc b/etc/enriched.doc
index ff57087c989..55e11004f05 100644
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -196,11 +196,11 @@ FTP or email may be obtained by sending an email message to
 enriched-verbose.
 
 </fixed></indent>-<indent> You can add annotations for your own text properties by making
-additions to <fixed>enriched-annotation-alist</fixed>.  Note that the
-standard requires you to name your annotation starting<italic> "x-"
-</italic>(as in <italic>"x-read-only"</italic>).  Please send me any such additions that
-you think might be of general interest so that I can include
-them in the distribution.</indent>
+additions to <fixed>enriched-translations</fixed>.  Note that the standard
+requires you to name your annotation starting<italic> "x-" </italic>(as in
+<italic>"x-read-only"</italic>).  Please send me any such additions that you
+think might be of general interest so that I can include them
+in the distribution.</indent>
 
 </indent>