From d88ae9bfd06c618e2f191ece8f47ec4973d2b112 Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Sat, 17 Mar 2012 15:00:54 -0400
Subject: [PATCH] Fix erroneous blinking in emacs (sgr with >15 fg but <16 bg)

---
 src/terminal/terminalframebuffer.cc | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/terminal/terminalframebuffer.cc b/src/terminal/terminalframebuffer.cc
index 35c6dc2..1e7af80 100644
--- a/src/terminal/terminalframebuffer.cc
+++ b/src/terminal/terminalframebuffer.cc
@@ -437,21 +437,16 @@ std::string Renditions::sgr( void ) const
   if ( inverse ) ret.append( ";7" );
   if ( invisible ) ret.append( ";8" );
 
-  if ( foreground_color > 37 ) { /* use 256-color set */
-    char col[ 64 ];
-    snprintf( col, 64, "m\033[38;5;%d", foreground_color - 30 );
-    ret.append( col );
-  } else if ( foreground_color ) {
+  if ( foreground_color
+       && (foreground_color <= 37) ) {
+    /* ANSI foreground color */
     char col[ 8 ];
     snprintf( col, 8, ";%d", foreground_color );
     ret.append( col );
   }
 
-  if ( background_color > 47 ) { /* use 256-color set */
-    char col[ 64 ];
-    snprintf( col, 64, "m\033[48;5;%d", background_color - 40 );
-    ret.append( col );
-  } else if ( background_color ) {
+  if ( background_color
+       && (background_color <= 47) ) {
     char col[ 8 ];
     snprintf( col, 8, ";%d", background_color );
     ret.append( col );
@@ -459,6 +454,18 @@ std::string Renditions::sgr( void ) const
 
   ret.append( "m" );
 
+  if ( foreground_color > 37 ) { /* use 256-color set */
+    char col[ 64 ];
+    snprintf( col, 64, "\033[38;5;%dm", foreground_color - 30 );
+    ret.append( col );
+  }
+
+  if ( background_color > 47 ) { /* use 256-color set */
+    char col[ 64 ];
+    snprintf( col, 64, "\033[48;5;%dm", background_color - 40 );
+    ret.append( col );
+  }
+
   return ret;
 }