--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.237
+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.237
+Problem: Compiler warning on an Alpha processor in Motif code.
+Solution: Change a typecast. (Adri Verhoef)
+Files: src/gui_motif.c
+
+
+*** ../vim-7.1.236/src/gui_motif.c Thu May 10 19:51:05 2007
+--- src/gui_motif.c Mon Jan 21 21:03:55 2008
+***************
+*** 3813,3819 ****
+
+ XtAddCallback(frdp->find, XmNactivateCallback,
+ find_replace_callback,
+! (XtPointer) (do_replace ? FRD_R_FINDNEXT : FRD_FINDNEXT));
+
+ if (do_replace)
+ {
+--- 3813,3819 ----
+
+ XtAddCallback(frdp->find, XmNactivateCallback,
+ find_replace_callback,
+! (do_replace ? (XtPointer)FRD_R_FINDNEXT : (XtPointer)FRD_FINDNEXT));
+
+ if (do_replace)
+ {
+*** ../vim-7.1.236/src/version.c Sat Jan 19 15:55:51 2008
+--- src/version.c Tue Jan 22 11:05:12 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 237,
+ /**/
+
+--
+I am always surprised in the Linux world how quickly solutions can be
+obtained. (Imagine sending an email to Bill Gates, asking why Windows
+crashed, and how to fix it... and then getting an answer that fixed the
+problem... <0>_<0> !) -- Mark Langdon
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.238
+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.238
+Problem: Using the 'c' flag with searchpair() may cause it to fail. Using
+ the 'r' flag doesn't work when 'wrapscan' is set. (A.Politz)
+Solution: Only use the 'c' flag for the first search, not for repeating.
+ When using 'r' imply 'W'. (Antony Scriven)
+Files: src/eval.c
+
+
+*** ../vim-7.1.237/src/eval.c Sat Jan 12 16:45:25 2008
+--- src/eval.c Tue Jan 22 11:42:28 2008
+***************
+*** 14189,14194 ****
+--- 14189,14198 ----
+ goto theend;
+ }
+
++ /* Using 'r' implies 'W', otherwise it doesn't work. */
++ if (flags & SP_REPEAT)
++ p_ws = FALSE;
++
+ /* Optional fifth argument: skip expression */
+ if (argvars[3].v_type == VAR_UNKNOWN
+ || argvars[4].v_type == VAR_UNKNOWN)
+***************
+*** 14344,14349 ****
+--- 14348,14356 ----
+ incl(&pos);
+ }
+ foundpos = pos;
++
++ /* clear the start flag to avoid getting stuck here */
++ options &= ~SEARCH_START;
+
+ /* If the skip pattern matches, ignore this match. */
+ if (*skip != NUL)
+*** ../vim-7.1.237/src/version.c Tue Jan 22 11:06:06 2008
+--- src/version.c Tue Jan 22 11:57:28 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 238,
+ /**/
+
+--
+To keep milk from turning sour: Keep it in the cow.
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.239
+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.239 (after 7.1.233)
+Problem: Compiler warning for sprintf() argument.
+Solution: Add a typecast. (Nico Weber)
+Files: src/ex_getln.c
+
+
+*** ../vim-7.1.238/src/ex_getln.c Sat Jan 19 15:55:51 2008
+--- src/ex_getln.c Tue Jan 22 12:40:54 2008
+***************
+*** 4694,4700 ****
+ {
+ /* Completion from Insert mode, pass fake arguments. */
+ keep = 0;
+! sprintf((char *)num, "%d", STRLEN(xp->xp_pattern));
+ args[1] = xp->xp_pattern;
+ }
+ else
+--- 4694,4700 ----
+ {
+ /* Completion from Insert mode, pass fake arguments. */
+ keep = 0;
+! sprintf((char *)num, "%d", (int)STRLEN(xp->xp_pattern));
+ args[1] = xp->xp_pattern;
+ }
+ else
+*** ../vim-7.1.238/src/version.c Tue Jan 22 11:58:41 2008
+--- src/version.c Tue Jan 22 12:42:36 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 239,
+ /**/
+
+--
+We apologise again for the fault in the subtitles. Those responsible for
+sacking the people who have just been sacked have been sacked.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.240
+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.240
+Problem: When "gUe" turns a German sharp s into SS the operation stops
+ before the end of the word. Latin2 has the same sharp s but it's
+ not changed to SS there.
+Solution: Make sure all the characters are operated upon. Detect the sharp
+ s in latin2. Also fixes that changing case of a multi-byte
+ character that changes the byte cound doesn't always work.
+Files: src/ops.c
+
+
+*** ../vim-7.1.239/src/ops.c Wed Jan 16 20:01:14 2008
+--- src/ops.c Tue Jan 22 16:00:07 2008
+***************
+*** 2184,2189 ****
+--- 2184,2191 ----
+ }
+ #endif
+
++ static int swapchars __ARGS((int op_type, pos_T *pos, int length));
++
+ /*
+ * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?".
+ */
+***************
+*** 2194,2202 ****
+ pos_T pos;
+ #ifdef FEAT_VISUAL
+ struct block_def bd;
+- int todo;
+ #endif
+! int did_change = 0;
+
+ if (u_save((linenr_T)(oap->start.lnum - 1),
+ (linenr_T)(oap->end.lnum + 1)) == FAIL)
+--- 2196,2203 ----
+ pos_T pos;
+ #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)
+***************
+*** 2210,2225 ****
+ {
+ block_prep(oap, &bd, pos.lnum, FALSE);
+ pos.col = bd.textcol;
+! for (todo = bd.textlen; todo > 0; --todo)
+! {
+! # ifdef FEAT_MBYTE
+! if (has_mbyte)
+! todo -= (*mb_ptr2len)(ml_get_pos(&pos)) - 1;
+! # endif
+! did_change |= swapchar(oap->op_type, &pos);
+! if (inc(&pos) == -1) /* at end of file */
+! break;
+! }
+ # ifdef FEAT_NETBEANS_INTG
+ if (usingNetbeans && did_change)
+ {
+--- 2211,2218 ----
+ {
+ block_prep(oap, &bd, pos.lnum, FALSE);
+ pos.col = bd.textcol;
+! did_change = swapchars(oap->op_type, &pos, bd.textlen);
+!
+ # ifdef FEAT_NETBEANS_INTG
+ if (usingNetbeans && did_change)
+ {
+***************
+*** 2249,2261 ****
+ else if (!oap->inclusive)
+ dec(&(oap->end));
+
+! while (ltoreq(pos, oap->end))
+! {
+! did_change |= swapchar(oap->op_type, &pos);
+! if (inc(&pos) == -1) /* at end of file */
+! break;
+! }
+!
+ if (did_change)
+ {
+ changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1,
+--- 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,
+***************
+*** 2309,2314 ****
+--- 2296,2337 ----
+ }
+
+ /*
++ * Invoke swapchar() on "length" bytes at position "pos".
++ * "pos" is advanced to just after the changed characters.
++ * "length" is rounded up to include the whole last multi-byte character.
++ * Also works correctly when the number of bytes changes.
++ * Returns TRUE if some character was changed.
++ */
++ static int
++ swapchars(op_type, pos, length)
++ int op_type;
++ pos_T *pos;
++ int length;
++ {
++ int todo;
++ int did_change = 0;
++
++ 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;
++ }
++ return did_change;
++ }
++
++ /*
+ * If op_type == OP_UPPER: make uppercase,
+ * if op_type == OP_LOWER: make lowercase,
+ * if op_type == OP_ROT13: do rot13 encoding,
+***************
+*** 2330,2336 ****
+ return FALSE;
+
+ #ifdef FEAT_MBYTE
+! if (op_type == OP_UPPER && enc_latin1like && c == 0xdf)
+ {
+ pos_T sp = curwin->w_cursor;
+
+--- 2353,2360 ----
+ return FALSE;
+
+ #ifdef FEAT_MBYTE
+! if (op_type == OP_UPPER && c == 0xdf
+! && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0))
+ {
+ pos_T sp = curwin->w_cursor;
+
+*** ../vim-7.1.239/src/version.c Tue Jan 22 12:44:03 2008
+--- src/version.c Tue Jan 22 15:36:36 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 240,
+ /**/
+
+--
+ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
+ King of all Britons, defeator of the Saxons, sovereign of all England!
+ [Pause]
+SOLDIER: Get away!
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.241
+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.241
+Problem: Focus change events not always ignored. (Erik Falor)
+Solution: Ignore K_IGNORE in Insert mode in a few more places.
+Files: src/edit.c
+
+
+*** ../vim-7.1.240/src/edit.c Wed Jan 16 20:01:14 2008
+--- src/edit.c Tue Jan 22 17:45:32 2008
+***************
+*** 703,712 ****
+ #endif
+
+ /*
+! * Get a character for Insert mode.
+ */
+ lastc = c; /* remember previous char for CTRL-D */
+! c = safe_vgetc();
+
+ #ifdef FEAT_AUTOCMD
+ /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */
+--- 703,715 ----
+ #endif
+
+ /*
+! * Get a character for Insert mode. Ignore K_IGNORE.
+ */
+ lastc = c; /* remember previous char for CTRL-D */
+! do
+! {
+! c = safe_vgetc();
+! } while (c == K_IGNORE);
+
+ #ifdef FEAT_AUTOCMD
+ /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */
+***************
+*** 777,783 ****
+ /* Prepare for or stop CTRL-X mode. This doesn't do completion, but
+ * it does fix up the text when finishing completion. */
+ compl_get_longest = FALSE;
+! if (c != K_IGNORE && ins_compl_prep(c))
+ continue;
+ #endif
+
+--- 780,786 ----
+ /* Prepare for or stop CTRL-X mode. This doesn't do completion, but
+ * it does fix up the text when finishing completion. */
+ compl_get_longest = FALSE;
+! if (ins_compl_prep(c))
+ continue;
+ #endif
+
+***************
+*** 4516,4530 ****
+ else
+ {
+ /* Need to get the character to have KeyTyped set. We'll put it
+! * back with vungetc() below. */
+ c = safe_vgetc();
+
+! /* Don't interrupt completion when the character wasn't typed,
+! * e.g., when doing @q to replay keys. */
+! if (c != Ctrl_R && KeyTyped)
+! compl_interrupted = TRUE;
+!
+! vungetc(c);
+ }
+ }
+ if (compl_pending != 0 && !got_int)
+--- 4519,4535 ----
+ else
+ {
+ /* Need to get the character to have KeyTyped set. We'll put it
+! * back with vungetc() below. But skip K_IGNORE. */
+ c = safe_vgetc();
++ if (c != K_IGNORE)
++ {
++ /* Don't interrupt completion when the character wasn't typed,
++ * e.g., when doing @q to replay keys. */
++ if (c != Ctrl_R && KeyTyped)
++ compl_interrupted = TRUE;
+
+! vungetc(c);
+! }
+ }
+ }
+ if (compl_pending != 0 && !got_int)
+*** ../vim-7.1.240/src/version.c Tue Jan 22 16:01:25 2008
+--- src/version.c Tue Jan 22 17:48:46 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 241,
+ /**/
+
+--
+The problem with political jokes is that they get elected.
+
+ /// 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 ///
--- /dev/null
+To: vim-dev@vim.org
+Subject: Patch 7.1.242
+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.242 (after 7.1.005)
+Problem: "cib" doesn't work properly on "(x)". (Tim Pope)
+Solution: Use ltoreq() instead of lt(). Also fix "ciT" on "<a>x</a>".
+Files: src/search.c
+
+
+*** ../vim-7.1.241/src/search.c Sat Jan 19 15:55:51 2008
+--- src/search.c Sat Jan 26 13:56:06 2008
+***************
+*** 3637,3643 ****
+ oap->inclusive = FALSE;
+ if (sol)
+ incl(&curwin->w_cursor);
+! else if (lt(start_pos, curwin->w_cursor))
+ /* Include the character under the cursor. */
+ oap->inclusive = TRUE;
+ else
+--- 3637,3643 ----
+ oap->inclusive = FALSE;
+ if (sol)
+ incl(&curwin->w_cursor);
+! else if (ltoreq(start_pos, curwin->w_cursor))
+ /* Include the character under the cursor. */
+ oap->inclusive = TRUE;
+ else
+***************
+*** 3754,3759 ****
+--- 3754,3763 ----
+ old_pos = curwin->w_cursor;
+ old_end = curwin->w_cursor; /* remember where we started */
+ old_start = old_end;
++ #ifdef FEAT_VISUAL
++ if (!VIsual_active || *p_sel == 'e')
++ #endif
++ decl(&old_end); /* old_end is inclusive */
+
+ /*
+ * If we start on "<aaa>" select that block.
+*** ../vim-7.1.241/src/version.c Tue Jan 22 17:49:17 2008
+--- src/version.c Sat Jan 26 21:14:05 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 242,
+ /**/
+
+--
+DENNIS: Oh, very nice. King, eh! I expect you've got a palace and fine
+ clothes and courtiers and plenty of food. And how d'you get that? By
+ exploiting the workers! By hanging on to outdated imperialist dogma
+ which perpetuates the social and economic differences in our society!
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
projects / packages / vim.git / commitdiff