- upstream patches

Changed files:
    7.1.243 -> 1.1
    7.1.244 -> 1.1

diff --git a/7.1.243 b/7.1.243
new file mode 100644 (file)
index 0000000..102546c
--- /dev/null
+++ b/7.1.243
@@ -0,0 +1,165 @@
+To: vim-dev@vim.org
+Subject: Patch 7.1.243
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.243 (after 7.1.240)
+Problem:    "U" doesn't work on all text in Visual mode. (Adri Verhoef)
+Solution:   Loop over all the lines to be changed.  Add tests for this.
+Files:     src/ops.c, src/testdir/test39.in, src/testdir/test39.ok
+
+
+*** ../vim-7.1.242/src/ops.c   Tue Jan 22 16:01:25 2008
+--- src/ops.c  Mon Feb  4 22:23:22 2008
+***************
+*** 2197,2203 ****
+  #ifdef FEAT_VISUAL
+      struct block_def bd;
+  #endif
+!     int                      did_change;
+  
+      if (u_save((linenr_T)(oap->start.lnum - 1),
+                                      (linenr_T)(oap->end.lnum + 1)) == FAIL)
+--- 2197,2203 ----
+  #ifdef FEAT_VISUAL
+      struct block_def bd;
+  #endif
+!     int                      did_change = FALSE;
+  
+      if (u_save((linenr_T)(oap->start.lnum - 1),
+                                      (linenr_T)(oap->end.lnum + 1)) == FAIL)
+***************
+*** 2242,2248 ****
+       else if (!oap->inclusive)
+           dec(&(oap->end));
+  
+!      did_change = swapchars(oap->op_type, &pos, oap->end.col - pos.col + 1);
+       if (did_change)
+       {
+           changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1,
+--- 2242,2259 ----
+       else if (!oap->inclusive)
+           dec(&(oap->end));
+  
+!      if (pos.lnum == oap->end.lnum)
+!          did_change = swapchars(oap->op_type, &pos,
+!                                                oap->end.col - pos.col + 1);
+!      else
+!          for (;;)
+!          {
+!              did_change |= swapchars(oap->op_type, &pos,
+!                              pos.lnum == oap->end.lnum ? oap->end.col + 1:
+!                                         (int)STRLEN(ml_get_pos(&pos)));
+!              if (ltoreq(oap->end, pos) || inc(&pos) == -1)
+!                  break;
+!          }
+       if (did_change)
+       {
+           changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1,
+***************
+*** 2314,2330 ****
+      for (todo = length; todo > 0; --todo)
+      {
+  # ifdef FEAT_MBYTE
+-      int pos_col = pos->col;
+- 
+       if (has_mbyte)
+           /* we're counting bytes, not characters */
+           todo -= (*mb_ptr2len)(ml_get_pos(pos)) - 1;
+  # endif
+       did_change |= swapchar(op_type, pos);
+- # ifdef FEAT_MBYTE
+-      /* Changing German sharp s to SS increases the column. */
+-      todo += pos->col - pos_col;
+- # endif
+       if (inc(pos) == -1)    /* at end of file */
+           break;
+      }
+--- 2325,2335 ----
+*** ../vim-7.1.242/src/testdir/test39.in       Sun Jun 13 18:21:09 2004
+--- src/testdir/test39.in      Wed Feb  6 13:57:37 2008
+***************
+*** 1,8 ****
+--- 1,10 ----
+  
+  Test Visual block mode commands
++ And test "U" in Visual mode, also on German sharp S.
+  
+  STARTTEST
+  :so small.vim
++ :so mbyte.vim
+  /^abcde
+  :" Test shift-right of a block
+  jllll\16jj>wll\16jlll>
+***************
+*** 14,20 ****
+  Gllll\16kkklllrq
+  :" Test block-change
+  G$khhh\16hhkkcmno\e
+! :$-4,$wq! test.out
+  ENDTEST
+  
+  abcdefghijklm
+--- 16,37 ----
+  Gllll\16kkklllrq
+  :" Test block-change
+  G$khhh\16hhkkcmno\e
+! :$-4,$w! test.out
+! :" gUe must uppercase a whole word, also when ß changes to SS
+! Gothe youtußeuu end\eYpk0wgUe
+! :" gUfx must uppercase until x, inclusive.
+! O- youßtußexu -\e0fogUfx
+! :" VU must uppercase a whole line
+! YpkVU
+! :" same, when it's the last line in the buffer
+! YPGi111\eVUddP
+! :" Uppercase two lines
+! Oblah di
+! doh dut\eVkUj
+! :" Uppercase part of two lines
+! ddppi333\ek0i222\efyllvjfuUk
+! :/^the/,$w >> test.out
+! :qa!
+  ENDTEST
+  
+  abcdefghijklm
+*** ../vim-7.1.242/src/testdir/test39.ok       Sun Jun 13 18:59:28 2004
+--- src/testdir/test39.ok      Tue Feb  5 22:25:38 2008
+***************
+*** 3,5 ****
+--- 3,13 ----
+  axyzqqqqef mno        ghijklm
+  axyzqqqqefgmnoklm
+  abcdqqqqijklm
++ the YOUTUSSEUU end
++ - yOUSSTUSSEXu -
++ THE YOUTUSSEUU END
++ 111THE YOUTUSSEUU END
++ BLAH DI
++ DOH DUT
++ 222the yoUTUSSEUU END
++ 333THE YOUTUßeuu end
+*** ../vim-7.1.242/src/version.c       Sat Jan 26 21:15:00 2008
+--- src/version.c      Wed Feb  6 14:41:00 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     243,
+  /**/
+
+-- 
+It's totally unfair to suggest - as many have - that engineers are socially
+inept.  Engineers simply have different objectives when it comes to social
+interaction.
+                               (Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

diff --git a/7.1.244 b/7.1.244
new file mode 100644 (file)
index 0000000..6c4c43f
--- /dev/null
+++ b/7.1.244
@@ -0,0 +1,58 @@
+To: vim-dev@vim.org
+Subject: Patch 7.1.244
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.244
+Problem:    GUI may have part of the command line cut off.
+Solution:   Don't round the number of lines up, always round down.
+           (Tony Houghton, Scott Dillard)
+Files:     src/gui.c
+
+
+*** ../vim-7.1.243/src/gui.c   Sat Jan 19 15:55:51 2008
+--- src/gui.c  Wed Feb  6 16:43:44 2008
+***************
+*** 1294,1304 ****
+      out_flush();
+  
+      gui.num_cols = (pixel_width - gui_get_base_width()) / gui.char_width;
+!     gui.num_rows = (pixel_height - gui_get_base_height()
+! #if !defined(FEAT_GUI_PHOTON) && !defined(FEAT_GUI_MSWIN)
+!                                  + (gui.char_height / 2)
+! #endif
+!                                      ) / gui.char_height;
+  
+      gui_position_components(pixel_width);
+  
+--- 1294,1300 ----
+      out_flush();
+  
+      gui.num_cols = (pixel_width - gui_get_base_width()) / gui.char_width;
+!     gui.num_rows = (pixel_height - gui_get_base_height()) / gui.char_height;
+  
+      gui_position_components(pixel_width);
+  
+*** ../vim-7.1.243/src/version.c       Wed Feb  6 14:43:50 2008
+--- src/version.c      Wed Feb  6 17:32:35 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     244,
+  /**/
+
+-- 
+A consultant is a person who takes your money and annoys your employees while
+tirelessly searching for the best way to extend the consulting contract.
+                               (Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///