Recognize also rxvt-16color and konsole-16color.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index fcce7852ba5d97a5b8e9bc2494444e2a32619461..b24c90bd2a67d69572f4ec7388b072155632c0a9 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-02  Bruno Haible  <bruno@clisp.org>
+
+       * lib/term-ostream.oo.c (term_ostream_create): Recognize also the
+       terminal types rxvt[-16color] and konsole[-16color].
+
 2006-12-01  Bruno Haible  <bruno@clisp.org>
 
        Preserve the hue of bright colors.

diff --git a/gnulib-local/lib/term-ostream.oo.c b/gnulib-local/lib/term-ostream.oo.c
index 1f1efbeeb3d556326555e35b7fbef68d9ef30794..09cfc9bc46c714ad05076abbf7f4d25eb1d52941 100644 (file)
--- a/gnulib-local/lib/term-ostream.oo.c
+++ b/gnulib-local/lib/term-ostream.oo.c
@@ -1768,7 +1768,13 @@ term_ostream_create (int fd, const char *filename)
      && stream->orig_pair != NULL);
   stream->colormodel =
     (stream->supports_foreground || stream->supports_background
-     ? (term != NULL && strlen (term) >= 5 && memcmp (term, "xterm", 5) == 0
+     ? (term != NULL
+       && (/* Recognize xterm-16color, xterm-88color, xterm-256color.  */
+           (strlen (term) >= 5 && memcmp (term, "xterm", 5) == 0)
+           || /* Recognize rxvt-16color.  */
+              (strlen (term) >= 4 && memcmp (term, "rxvt", 7) == 0)
+           || /* Recognize konsole-16color.  */
+              (strlen (term) >= 7 && memcmp (term, "konsole", 7) == 0))
        ? (stream->max_colors == 256 ? cm_xterm256 :
           stream->max_colors == 88 ? cm_xterm88 :
           stream->max_colors == 16 ? cm_xterm16 :