From: Juri Linkov <juri@jurta.org>
Date: Mon, 22 Aug 2005 20:47:49 +0000 (+0000)
Subject: (turn_on_face): Check for TS_set_foreground and
X-Git-Tag: emacs-pretest-22.0.90~7494
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=753d161b0fa178327493c373de9d8777240c28cd;p=emacs.git

(turn_on_face): Check for TS_set_foreground and
TS_set_background depending on standout_mode.  Simplify.
---

diff --git a/src/term.c b/src/term.c
index 76cf2e2c6f0..2b4ea7e23a4 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2011,24 +2011,20 @@ turn_on_face (f, face_id)
 
   if (TN_max_colors > 0)
     {
-      char *p;
+      char *ts, *p;
 
-      if (fg >= 0 && TS_set_foreground)
+      ts = standout_mode ? TS_set_background : TS_set_foreground;
+      if (fg >= 0 && ts)
 	{
-	  if (standout_mode)
-	    p = tparam (TS_set_background, NULL, 0, (int) fg);
-	  else
-	    p = tparam (TS_set_foreground, NULL, 0, (int) fg);
+	  p = tparam (ts, NULL, 0, (int) fg);
 	  OUTPUT (p);
 	  xfree (p);
 	}
 
-      if (bg >= 0 && TS_set_background)
+      ts = standout_mode ? TS_set_foreground : TS_set_background;
+      if (bg >= 0 && ts)
 	{
-	  if (standout_mode)
-	    p = tparam (TS_set_foreground, NULL, 0, (int) bg);
-	  else
-	    p = tparam (TS_set_background, NULL, 0, (int) bg);
+	  p = tparam (ts, NULL, 0, (int) bg);
 	  OUTPUT (p);
 	  xfree (p);
 	}