Patch/vim7/always_72_chars_per_line_if_undefined.patch

   1 $Id$
   2
   3 Index: src/edit.c
   4 ===================================================================
   5 RCS file: /cvsroot/vim/vim7/src/edit.c,v
   6 retrieving revision 1.141
   7 diff -u -r1.141 edit.c
   8 --- src/edit.c  6 Aug 2008 16:56:55 -0000       1.141
   9 +++ src/edit.c  30 Aug 2008 08:23:06 -0000
  10 @@ -6175,6 +6175,7 @@
  11         textwidth = W_WIDTH(curwin) - 1;
  12         if (textwidth > 79)
  13             textwidth = 79;
  14 +       textwidth = 72; /* Added by sunny@sunbase.org -- always use 72 if not defined. */
  15      }
  16      return textwidth;
  17  }
  18 Index: src/ex_cmds.c
  19 ===================================================================
  20 RCS file: /cvsroot/vim/vim7/src/ex_cmds.c,v
  21 retrieving revision 1.113
  22 diff -u -r1.113 ex_cmds.c
  23 --- src/ex_cmds.c       6 Aug 2008 13:03:07 -0000       1.113
  24 +++ src/ex_cmds.c       30 Aug 2008 08:23:06 -0000
  25 @@ -172,14 +172,14 @@
  26         /*
  27          * if 'textwidth' set, use it
  28          * else if 'wrapmargin' set, use it
  29 -        * if invalid value, use 80
  30 +        * if invalid value, use 72
  31          */
  32         if (width <= 0)
  33             width = curbuf->b_p_tw;
  34         if (width == 0 && curbuf->b_p_wm > 0)
  35             width = W_WIDTH(curwin) - curbuf->b_p_wm;
  36         if (width <= 0)
  37 -           width = 80;
  38 +           width = 72; /* Changed from 80 to 72 by sunny@sunbase.org */
  39      }
  40
  41      if (u_save((linenr_T)(eap->line1 - 1), (linenr_T)(eap->line2 + 1)) == FAIL)