From 488d3624be68a1655fc8b40241f514e52855d18b Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Thu, 18 Jun 2009 19:18:48 +0200 Subject: update --- gvim/vim-7.2/7.2.158 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 gvim/vim-7.2/7.2.158 (limited to 'gvim/vim-7.2/7.2.158') diff --git a/gvim/vim-7.2/7.2.158 b/gvim/vim-7.2/7.2.158 new file mode 100644 index 0000000..87daf24 --- /dev/null +++ b/gvim/vim-7.2/7.2.158 @@ -0,0 +1,63 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.158 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.158 +Problem: Warnings from VisualC compiler. +Solution: Add type casts. (George Reilly) +Files: src/ops.c + + +*** ../vim-7.2.157/src/ops.c Wed Mar 11 16:26:01 2009 +--- src/ops.c Wed Apr 22 13:01:46 2009 +*************** +*** 495,504 **** + block_space_width = non_white_col - oap->start_vcol; + /* We will shift by "total" or "block_space_width", whichever is less. + */ +! shift_amount = (block_space_width < total? block_space_width: total); + + /* The column to which we will shift the text. */ +! destination_col = non_white_col - shift_amount; + + /* Now let's find out how much of the beginning of the line we can + * reuse without modification. */ +--- 495,505 ---- + block_space_width = non_white_col - oap->start_vcol; + /* We will shift by "total" or "block_space_width", whichever is less. + */ +! shift_amount = (block_space_width < (size_t)total +! ? block_space_width : (size_t)total); + + /* The column to which we will shift the text. */ +! destination_col = (colnr_T)(non_white_col - shift_amount); + + /* Now let's find out how much of the beginning of the line we can + * reuse without modification. */ +*** ../vim-7.2.157/src/version.c Wed Apr 22 16:42:24 2009 +--- src/version.c Wed Apr 22 17:42:19 2009 +*************** +*** 678,679 **** +--- 678,681 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 158, + /**/ + +-- +ARTHUR: What? +BLACK KNIGHT: None shall pass. +ARTHUR: I have no quarrel with you, good Sir knight, but I must cross + this bridge. +BLACK KNIGHT: Then you shall die. + The Quest for the Holy Grail (Monty Python) + + /// 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 /// -- cgit v1.2.3-24-g4f1b