Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-453
   Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1 files changed, 8 insertions, 2 deletions

diff --git a/src/term.c b/src/term.c
index 1d165d36aca..4fbf87daba8 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1850,14 +1850,20 @@ turn_on_face (f, face_id)
 
       if (fg >= 0 && tty->TS_set_foreground)
         {
-          p = tparam (tty->TS_set_foreground, NULL, 0, (int) fg);
+          if (tty->standout_mode)
+            p = tparam (tty->TS_set_background, NULL, 0, (int) fg);
+          else
+            p = tparam (tty->TS_set_foreground, NULL, 0, (int) fg);
           OUTPUT (tty, p);
           xfree (p);
         }
 
       if (bg >= 0 && tty->TS_set_background)
         {
-          p = tparam (tty->TS_set_background, NULL, 0, (int) bg);
+          if (tty->standout_mode)
+            p = tparam (tty->TS_set_foreground, NULL, 0, (int) bg);
+          else
+            p = tparam (tty->TS_set_background, NULL, 0, (int) bg);
           OUTPUT (tty, p);
           xfree (p);
         }