--- rxvt-unicode/src/command.C	2008/11/04 22:44:09	1.423
+++ rxvt-unicode/src/command.C	2008/11/12 02:37:58	1.430
@@ -1686,6 +1686,7 @@
   refresh_check ();
 }
 
+#if ENABLE_FRILLS
 void
 rxvt_term::set_urgency (bool enable)
 {
@@ -1699,6 +1700,7 @@
       urgency_hint = enable;
     }
 }
+#endif
 
 void
 rxvt_term::focus_in ()
@@ -2839,7 +2841,7 @@
                 scr_soft_reset ();
 
                 static const int pm_h[] = { 7, 25 };
-                static const int pm_l[] = { 1, 3, 4, 5, 6, 7, 9, 66, 1000, 1001, 1049 };
+                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
 
                 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
                 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
@@ -3402,6 +3404,9 @@
         process_color_seq (op, Color_IT, str, resp);
         break;
 #endif
+      case URxvt_Color_border:
+        process_color_seq (op, Color_border, str, resp);
+        break;
 #if ENABLE_TRANSPARENCY
       case URxvt_Color_tint:
         process_color_seq (op, Color_tint, str, resp);
@@ -3586,29 +3591,31 @@
     const int       argval;
     const unsigned long bit;
   } argtopriv[] = {
-                  { 1, PrivMode_aplCUR },
+                  { 1, PrivMode_aplCUR },       // DECCKM
                   { 2, PrivMode_vt52 },
-                  { 3, PrivMode_132 },
-                  { 4, PrivMode_smoothScroll },
-                  { 5, PrivMode_rVideo },
-                  { 6, PrivMode_relOrigin },
-                  { 7, PrivMode_Autowrap },
-                 // 8, bi-directional support mode
+                  { 3, PrivMode_132 },          // DECCOLM
+                  { 4, PrivMode_smoothScroll }, // DECSCLM
+                  { 5, PrivMode_rVideo },       // DECSCNM
+                  { 6, PrivMode_relOrigin },    // DECOM
+                  { 7, PrivMode_Autowrap },     // DECAWM
+                 // 8, auto-repeat keys         // DECARM
                   { 9, PrivMode_MouseX10 },
-                 // 18, 19 printing-related
-                  { 25, PrivMode_VisibleCursor },
+                 // 18 end FF to printer after print screen
+                 // 19 Print screen prints full screen/scorll region
+                  { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
 #ifdef scrollBar_esc
                   { scrollBar_esc, PrivMode_scrollBar },
 #endif
-                  { 35, PrivMode_ShiftKeys }, // rxvt extension
+                  { 35, PrivMode_ShiftKeys },   // rxvt extension
+                 // 38, tektronix mode          // DECTEK
                   { 40, PrivMode_132OK },
                  // 41 xterm more fixes NYI
                  // 45 margin bell NYI
                  // 46 start logging
                   { 47, PrivMode_Screen },
-                  { 66, PrivMode_aplKP },
+                  { 66, PrivMode_aplKP },       // DECPAM/DECPNM
 #ifndef NO_BACKSPACE_KEY
-                  { 67, PrivMode_BackSpace },
+                  { 67, PrivMode_BackSpace },   // DECBKM
 #endif
                   { 1000, PrivMode_MouseX11 },
                   { 1002, PrivMode_MouseBtnEvent },
@@ -3657,7 +3664,6 @@
             break;
 #endif
           case 1048:		/* alternative cursor save */
-          case 1049:
             if (option (Opt_secondaryScreen))
               if (mode == 0)
                 scr_cursor (RESTORE);
@@ -3680,10 +3686,7 @@
               break;
             case 3:			/* 80/132 */
               if (priv_modes & PrivMode_132OK)
-                {
-                  scr_poweron ();
-                  set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
-                }
+                set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
               break;
             case 4:			/* smooth scrolling */
               set_option (Opt_jumpScroll, !state);
@@ -3735,6 +3738,7 @@
                 }
               else
                 vt_emask_mouse = NoEventMask;
+
               vt_select_input ();
               break;
             case 1010:		/* scroll to bottom on TTY output inhibit */
@@ -3745,15 +3749,23 @@
               break;
             case 1047:		/* secondary screen w/ clearing last */
               if (option (Opt_secondaryScreen))
-                if (current_screen != PRIMARY)
+                if (!state)
                   scr_erase_screen (2);
+
               scr_change_screen (state);
               break;
             case 1049:		/* secondary screen w/ clearing first */
+              if (option (Opt_secondaryScreen))
+                if (state)
+                  scr_cursor (SAVE);
+
               scr_change_screen (state);
+
               if (option (Opt_secondaryScreen))
-                if (current_screen != PRIMARY)
+                if (state)
                   scr_erase_screen (2);
+                else
+                  scr_cursor (RESTORE);
               break;
             default:
               break;