[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.462 by root, Thu Jun 17 11:01:57 2021 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
-      if (top_row)
+      if ((rewrap_always || top_row) && !rewrap_never)
         {
           // Re-wrap lines. This is rather ugly, possibly because I am too dumb
           // to come up with a lean and mean algorithm.
           // TODO: maybe optimise when width didn't change
   /* convert normal newline chars into common keyboard Return key sequence */
   for (unsigned int i = 0; i < len; i++)
     if (data[i] == C0_LF)
       data[i] = C0_CR;
-  if (priv_modes & PrivMode_BracketPaste)
+  #if ENABLE_FRILLS
+  if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
     tt_printf ("\x1b[200~");
+  #endif
   tt_write (data, len);
-  if (priv_modes & PrivMode_BracketPaste)
+  #if ENABLE_FRILLS
+  if ((priv_modes & PrivMode_BracketPaste) && !option (Opt_disablePasteBrackets))
     tt_printf ("\x1b[201~");
+  #endif
 }
 void
 rxvt_term::paste (char *data, unsigned int len) noexcept
 {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines