[PATCH v3 1/4] Remove unused terminal color pair count.

[Rami Ylimäki]

From: Rami Ylimäki <address@hidden>

The TN_max_pairs field is unused and would be inconvenient with direct
color modes.

* src/termchar.h (tty_display_info): Remove TN_max_pairs field
describing maximum number of terminal background/foreground color pairs.
* src/term.c (tty_default_color_capabilities, tty_setup_colors,
init_tty): Remove references to TN_max_pairs.
---
 src/term.c     | 6 ------
 src/termchar.h | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/src/term.c b/src/term.c
index c067a86..b0ff9cb 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2048,7 +2048,6 @@ TERMINAL does not refer to a text terminal.  */)
    to work around an HPUX compiler bug (?). See
    http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00410.html  */
 static int default_max_colors;
-static int default_max_pairs;
 static int default_no_color_video;
 static char *default_orig_pair;
 static char *default_set_foreground;
@@ -2066,7 +2065,6 @@ tty_default_color_capabilities (struct tty_display_info 
*tty, bool save)
       dupstring (&default_set_foreground, tty->TS_set_foreground);
       dupstring (&default_set_background, tty->TS_set_background);
       default_max_colors = tty->TN_max_colors;
-      default_max_pairs = tty->TN_max_pairs;
       default_no_color_video = tty->TN_no_color_video;
     }
   else
@@ -2075,7 +2073,6 @@ tty_default_color_capabilities (struct tty_display_info 
*tty, bool save)
       tty->TS_set_foreground = default_set_foreground;
       tty->TS_set_background = default_set_background;
       tty->TN_max_colors = default_max_colors;
-      tty->TN_max_pairs = default_max_pairs;
       tty->TN_no_color_video = default_no_color_video;
     }
 }
@@ -2095,7 +2092,6 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
     {
       case -1:  /* no colors at all */
        tty->TN_max_colors = 0;
-       tty->TN_max_pairs = 0;
        tty->TN_no_color_video = 0;
        tty->TS_set_foreground = tty->TS_set_background = tty->TS_orig_pair = 
NULL;
        break;
@@ -2113,7 +2109,6 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
        tty->TS_set_background = "\033[4%dm";
 #endif
        tty->TN_max_colors = 8;
-       tty->TN_max_pairs = 64;
        tty->TN_no_color_video = 0;
        break;
     }
@@ -4135,7 +4130,6 @@ use the Bourne shell command 'TERM=...; export TERM' 
(C-shell:\n\
        }
 
       tty->TN_max_colors = tgetnum ("Co");
-      tty->TN_max_pairs = tgetnum ("pa");
 
       tty->TN_no_color_video = tgetnum ("NC");
       if (tty->TN_no_color_video == -1)
diff --git a/src/termchar.h b/src/termchar.h
index e6e483e..cf061a9 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -149,10 +149,6 @@ struct tty_display_info
 
   int TN_max_colors;            /* "Co" -- number of colors.  */
 
-  /* "pa" -- max. number of color pairs on screen.  Not handled yet.
-     Could be a problem if not equal to TN_max_colors * TN_max_colors.  */
-  int TN_max_pairs;
-
   /* "op" -- SVr4 set default pair to its original value.  */
   const char *TS_orig_pair;
 
-- 
2.7.4