Author: glen Date: Tue Dec 4 05:59:24 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- from upstream
---- Files affected:
SOURCES:
7.1.155 (NONE -> 1.1) (NEW), 7.1.156 (NONE -> 1.1) (NEW), 7.1.157 (NONE ->
1.1) (NEW), 7.1.158 (NONE -> 1.1) (NEW), 7.1.159 (NONE -> 1.1) (NEW),
7.1.160 (NONE -> 1.1) (NEW), 7.1.161 (NONE -> 1.1) (NEW), 7.1.162 (NONE ->
1.1) (NEW), 7.1.163 (NONE -> 1.1) (NEW), 7.1.164 (NONE -> 1.1) (NEW),
7.1.165 (NONE -> 1.1) (NEW), 7.1.166 (NONE -> 1.1) (NEW), 7.1.167 (NONE ->
1.1) (NEW), 7.1.168 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/7.1.155
diff -u /dev/null SOURCES/7.1.155:1.1
--- /dev/null Tue Dec 4 06:59:24 2007
+++ SOURCES/7.1.155 Tue Dec 4 06:59:19 2007
@@ -0,0 +1,53 @@
+To: [EMAIL PROTECTED]
+Subject: Patch 7.1.155
+Fcc: outbox
+From: Bram Moolenaar <[EMAIL PROTECTED]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.155
+Problem: Crash when 'undolevels' is 0 and repeating "udd". (James Vega)
+Solution: When there is only one branch use u_freeheader() to delete it.
+Files: src/undo.c
+
+
+*** ../vim-7.1.154/src/undo.c Mon Oct 1 22:53:27 2007
+--- src/undo.c Sat Nov 10 13:45:28 2007
+***************
+*** 1677,1682 ****
+--- 1677,1690 ----
+ u_header_T **uhpp; /* if not NULL reset when freeing this
header */
+ {
+ u_header_T *tofree, *next;
++
++ /* If this is the top branch we may need to use u_freeheader() to update
++ * all the pointers. */
++ if (uhp == buf->b_u_oldhead)
++ {
++ u_freeheader(buf, uhp, uhpp);
++ return;
++ }
+
+ if (uhp->uh_alt_prev != NULL)
+ uhp->uh_alt_prev->uh_alt_next = NULL;
+*** ../vim-7.1.154/src/version.c Thu Nov 8 21:23:34 2007
+--- src/version.c Sat Nov 10 22:49:40 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 155,
+ /**/
+
+--
+I AM THANKFUL...
+...for the piles of laundry and ironing because it means I
+have plenty of clothes to wear.
+
+ /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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 ///
================================================================
Index: SOURCES/7.1.156
diff -u /dev/null SOURCES/7.1.156:1.1
--- /dev/null Tue Dec 4 06:59:24 2007
+++ SOURCES/7.1.156 Tue Dec 4 06:59:19 2007
@@ -0,0 +1,121 @@
+To: [EMAIL PROTECTED]
+Subject: Patch 7.1.156
+Fcc: outbox
+From: Bram Moolenaar <[EMAIL PROTECTED]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.156
+Problem: Overlapping arguments for strcpy() when expanding command line
+ variables.
+Solution: Use mch_memmove() instead of STRCPY(). Also fix a few typos.
+ (Dominique Pelle)
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.1.155/src/ex_docmd.c Fri Oct 19 16:20:09 2007
+--- src/ex_docmd.c Sat Nov 10 12:39:51 2007
+***************
+*** 666,672 ****
+ if (ex_pressedreturn)
+ {
+ /* go up one line, to overwrite the ":<CR>" line, so the
+! * output doensn't contain empty lines. */
+ msg_row = prev_msg_row;
+ if (prev_msg_row == Rows - 1)
+ msg_row--;
+--- 666,672 ----
+ if (ex_pressedreturn)
+ {
+ /* go up one line, to overwrite the ":<CR>" line, so the
+! * output doesn't contain empty lines. */
+ msg_row = prev_msg_row;
+ if (prev_msg_row == Rows - 1)
+ msg_row--;
+***************
+*** 2760,2766 ****
+
+ /*
+ * Isolate the command and search for it in the command table.
+! * Exeptions:
+ * - the 'k' command can directly be followed by any character.
+ * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or
'r'
+ * but :sre[wind] is another command, as are :scrip[tnames],
+--- 2760,2766 ----
+
+ /*
+ * Isolate the command and search for it in the command table.
+! * Exceptions:
+ * - the 'k' command can directly be followed by any character.
+ * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or
'r'
+ * but :sre[wind] is another command, as are :scrip[tnames],
+***************
+*** 6677,6683 ****
+ * The list should be allocated using alloc(), as should each item in the
+ * list. This function takes over responsibility for freeing the list.
+ *
+! * XXX The list is made into the arggument list. This is freed using
+ * FreeWild(), which does a series of vim_free() calls, unless the two
defines
+ * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
+ * routine _fnexplodefree() is used. This may cause problems, but as the drop
+--- 6677,6683 ----
+ * The list should be allocated using alloc(), as should each item in the
+ * list. This function takes over responsibility for freeing the list.
+ *
+! * XXX The list is made into the argument list. This is freed using
+ * FreeWild(), which does a series of vim_free() calls, unless the two
defines
+ * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
+ * routine _fnexplodefree() is used. This may cause problems, but as the drop
+***************
+*** 7795,7801 ****
+ if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
+ && !eap->forceit)
+ {
+! EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to
override)"));
+ return;
+ }
+
+--- 7795,7801 ----
+ if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
+ && !eap->forceit)
+ {
+! EMSG(_("E747: Cannot change directory, buffer is modified (add ! to
override)"));
+ return;
+ }
+
+***************
+*** 9391,9397 ****
+ if (src > srcstart && src[-1] == '\\')
+ {
+ *usedlen = 0;
+! STRCPY(src - 1, src); /* remove backslash */
+ return NULL;
+ }
+
+--- 9391,9397 ----
+ if (src > srcstart && src[-1] == '\\')
+ {
+ *usedlen = 0;
+! mch_memmove(src - 1, src, STRLEN(src) + 1); /* remove backslash */
+ return NULL;
+ }
+
+*** ../vim-7.1.155/src/version.c Sat Nov 10 22:50:20 2007
+--- src/version.c Sun Nov 11 19:15:51 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 156,
+ /**/
+
+--
+Common sense is what tells you that the world is flat.
+
+ /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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 ///
================================================================
Index: SOURCES/7.1.157
diff -u /dev/null SOURCES/7.1.157:1.1
--- /dev/null Tue Dec 4 06:59:24 2007
+++ SOURCES/7.1.157 Tue Dec 4 06:59:19 2007
@@ -0,0 +1,55 @@
+To: [EMAIL PROTECTED]
+Subject: Patch 7.1.157
+Fcc: outbox
+From: Bram Moolenaar <[EMAIL PROTECTED]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.157
+Problem: In Ex mode, :" gives an error at end-of-file. (Michael Hordijk)
+Solution: Only give an error for an empty line, not for a comment.
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.1.156/src/ex_docmd.c Sun Nov 11 19:16:44 2007
+--- src/ex_docmd.c Sat Nov 17 20:23:38 2007
+***************
+*** 1741,1747 ****
+ }
+
+ /* ignore comment and empty lines */
+! if (*ea.cmd == '"' || *ea.cmd == NUL)
+ {
+ ex_pressedreturn = TRUE;
+ goto doend;
+--- 1741,1749 ----
+ }
+
+ /* ignore comment and empty lines */
+! if (*ea.cmd == '"')
+! goto doend;
+! if (*ea.cmd == NUL)
+ {
+ ex_pressedreturn = TRUE;
+ goto doend;
+*** ../vim-7.1.156/src/version.c Sun Nov 11 19:16:44 2007
+--- src/version.c Tue Nov 20 12:28:22 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 157,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+119. You are reading a book and look for the scroll bar to get to
+ the next page.
+
+ /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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 ///
================================================================
Index: SOURCES/7.1.158
diff -u /dev/null SOURCES/7.1.158:1.1
--- /dev/null Tue Dec 4 06:59:24 2007
+++ SOURCES/7.1.158 Tue Dec 4 06:59:19 2007
@@ -0,0 +1,157 @@
+To: [EMAIL PROTECTED]
+Subject: Patch 7.1.158 (extra)
+Fcc: outbox
+From: Bram Moolenaar <[EMAIL PROTECTED]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.158 (extra)
+Problem: Win32 console: When 'encoding' is "utf-8" and typing Alt-y the
+ result is wrong. Win32 GUI: Alt-y results in "u" when 'encoding'
+ is "cp1250" (Lukas Cerman)
+Solution: For utf-8 don't set the 7th bit in a byte, convert to the correct
+ byte sequence. For cp1250, when conversion to 'encoding' results
+ in the 7th bit not set, set the 7th bit after conversion.
+Files: src/os_win32.c, src/gui_w48.c
+
+
+*** ../vim-7.1.157/src/os_win32.c Mon Oct 1 20:33:45 2007
+--- src/os_win32.c Sat Oct 27 17:35:04 2007
+***************
+*** 1521,1527 ****
+--- 1521,1532 ----
+ #endif
+ )
+ {
++ #ifdef FEAT_MBYTE
++ n = (*mb_char2bytes)(typeahead[typeaheadlen] | 0x80,
++ typeahead + typeaheadlen);
++ #else
+ typeahead[typeaheadlen] |= 0x80;
++ #endif
+ modifiers &= ~MOD_MASK_ALT;
+ }
+
+*** ../vim-7.1.157/src/gui_w48.c Sun Sep 30 14:00:41 2007
+--- src/gui_w48.c Mon Oct 29 20:00:25 2007
+***************
+*** 486,495 ****
+
+ /*
+ * Convert Unicode character "ch" to bytes in "string[slen]".
+ * Return the length.
+ */
+ static int
+! char_to_string(int ch, char_u *string, int slen)
+ {
+ int len;
+ int i;
+--- 486,496 ----
+
+ /*
+ * Convert Unicode character "ch" to bytes in "string[slen]".
++ * When "had_alt" is TRUE the ALT key was included in "ch".
+ * Return the length.
+ */
+ static int
+! char_to_string(int ch, char_u *string, int slen, int had_alt)
+ {
+ int len;
+ int i;
+***************
+*** 522,529 ****
+--- 523,544 ----
+ * "enc_codepage" is non-zero use the standard Win32 function,
+ * otherwise use our own conversion function (e.g., for UTF-8). */
+ if (enc_codepage > 0)
++ {
+ len = WideCharToMultiByte(enc_codepage, 0, wstring, len,
+ string, slen, 0, NULL);
++ /* If we had included the ALT key into the character but now the
++ * upper bit is no longer set, that probably means the conversion
++ * failed. Convert the original character and set the upper bit
++ * afterwards. */
++ if (had_alt && len == 1 && ch >= 0x80 && string[0] < 0x80)
++ {
++ wstring[0] = ch & 0x7f;
++ len = WideCharToMultiByte(enc_codepage, 0, wstring, len,
++ string, slen, 0, NULL);
++ if (len == 1) /* safety check */
++ string[0] |= 0x80;
++ }
++ }
+ else
+ {
+ len = 1;
+***************
+*** 573,579 ****
+ char_u string[40];
+ int len = 0;
+
+! len = char_to_string(ch, string, 40);
+ if (len == 1 && string[0] == Ctrl_C && ctrl_c_interrupts)
+ {
+ trash_input_buf();
+--- 588,594 ----
+ char_u string[40];
+ int len = 0;
+
+! len = char_to_string(ch, string, 40, FALSE);
+ if (len == 1 && string[0] == Ctrl_C && ctrl_c_interrupts)
+ {
+ trash_input_buf();
+***************
+*** 640,646 ****
+ {
+ /* Although the documentation isn't clear about it, we assume "ch" is
+ * a Unicode character. */
+! len += char_to_string(ch, string + len, 40 - len);
+ }
+
+ add_to_input_buf(string, len);
+--- 655,661 ----
+ {
+ /* Although the documentation isn't clear about it, we assume "ch" is
+ * a Unicode character. */
+! len += char_to_string(ch, string + len, 40 - len, TRUE);
+ }
+
+ add_to_input_buf(string, len);
+***************
+*** 1775,1781 ****
+ int len;
+
+ /* Handle "key" as a Unicode character. */
+! len = char_to_string(key, string, 40);
+ add_to_input_buf(string, len);
+ }
+ break;
+--- 1790,1796 ----
+ int len;
+
+ /* Handle "key" as a Unicode character. */
+! len = char_to_string(key, string, 40, FALSE);
+ add_to_input_buf(string, len);
+ }
+ break;
+*** ../vim-7.1.157/src/version.c Tue Nov 20 12:30:31 2007
+--- src/version.c Tue Nov 20 17:19:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 158,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+123. You ask the car dealer to install an extra cigarette lighter
+ on your new car to power your notebook.
+
+ /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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 ///
================================================================
Index: SOURCES/7.1.159
diff -u /dev/null SOURCES/7.1.159:1.1
--- /dev/null Tue Dec 4 06:59:24 2007
+++ SOURCES/7.1.159 Tue Dec 4 06:59:19 2007
@@ -0,0 +1,54 @@
+To: [EMAIL PROTECTED]
+Subject: Patch 7.1.159
+Fcc: outbox
+From: Bram Moolenaar <[EMAIL PROTECTED]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.159
+Problem: strcpy() has overlapping arguments.
+Solution: Use mch_memmove() instead. (Dominique Pelle)
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.1.158/src/ex_cmds.c Thu Nov 8 20:47:34 2007
+--- src/ex_cmds.c Sun Nov 18 14:11:58 2007
+***************
+*** 4885,4891 ****
+ ++line2;
+ /* move the cursor to the new line, like Vi */
+ ++curwin->w_cursor.lnum;
+! STRCPY(new_start, p1 + 1); /* copy the rest */
+ p1 = new_start - 1;
+ }
+ }
+--- 4885,4892 ----
+ ++line2;
+ /* move the cursor to the new line, like Vi */
+ ++curwin->w_cursor.lnum;
+! /* copy the rest */
+! mch_memmove(new_start, p1 + 1, STRLEN(p1 + 1) + 1);
+ p1 = new_start - 1;
+ }
+ }
+*** ../vim-7.1.158/src/version.c Tue Nov 20 17:21:28 2007
+--- src/version.c Tue Nov 20 18:01:45 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 159,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+125. You begin to wonder how often it REALLY is necessary to get up
+ and shower or bathe.
+
+ /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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 ///
================================================================
Index: SOURCES/7.1.160
diff -u /dev/null SOURCES/7.1.160:1.1
--- /dev/null Tue Dec 4 06:59:25 2007
+++ SOURCES/7.1.160 Tue Dec 4 06:59:19 2007
@@ -0,0 +1,54 @@
+To: [EMAIL PROTECTED]
+Subject: Patch 7.1.160
+Fcc: outbox
+From: Bram Moolenaar <[EMAIL PROTECTED]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.160
+Problem: When a focus autocommand is defined, getting or losing focus
+ causes the hit-enter prompt to be redrawn. (Bjorn Winckler)
+Solution: Overwrite the last line.
+Files: src/message.c
+
+
+*** ../vim-7.1.159/src/message.c Thu Sep 13 22:04:30 2007
+--- src/message.c Sun Nov 4 17:33:15 2007
+***************
+*** 2850,2855 ****
+--- 2850,2864 ----
+ }
+ else if (State == HITRETURN || State == SETWSIZE)
+ {
++ if (msg_row == Rows - 1)
++ {
++ /* Avoid drawing the "hit-enter" prompt below the previous one,
++ * overwrite it. Esp. useful when regaining focus and a
++ * FocusGained autocmd exists but didn't draw anything. */
++ msg_didout = FALSE;
++ msg_col = 0;
++ msg_clr_eos();
++ }
+ hit_return_msg();
+ msg_row = Rows - 1;
+ }
+*** ../vim-7.1.159/src/version.c Tue Nov 20 18:03:34 2007
+--- src/version.c Sat Nov 24 15:41:43 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 160,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+142. You dream about creating the world's greatest web site.
+
+ /// Bram Moolenaar -- [EMAIL PROTECTED] -- 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 ///
================================================================
Index: SOURCES/7.1.161
diff -u /dev/null SOURCES/7.1.161:1.1
--- /dev/null Tue Dec 4 06:59:25 2007
+++ SOURCES/7.1.161 Tue Dec 4 06:59:19 2007
@@ -0,0 +1,176 @@
+To: [EMAIL PROTECTED]
+Subject: Patch 7.1.161
+Fcc: outbox
+From: Bram Moolenaar <[EMAIL PROTECTED]>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.161
+Problem: Compilation errors with tiny features and EXITFREE.
+Solution: Add #ifdefs. (Dominique Pelle)
+Files: src/edit.c, src/misc2.c
+
+
+*** ../vim-7.1.160/src/edit.c Thu Nov 8 13:03:33 2007
+--- src/edit.c Sat Nov 24 14:57:46 2007
+***************
+*** 2236,2242 ****
+ while (i < actual_len && (p - IObuff + 6) < IOSIZE)
+ #ifdef FEAT_MBYTE
+ if (has_mbyte)
+! p += mb_char2bytes(wca[i++], p);
+ else
+ #endif
+ *(p++) = wca[i++];
+--- 2236,2242 ----
+ while (i < actual_len && (p - IObuff + 6) < IOSIZE)
+ #ifdef FEAT_MBYTE
+ if (has_mbyte)
+! p += (*mb_char2bytes)(wca[i++], p);
+ else
+ #endif
+ *(p++) = wca[i++];
+***************
+*** 6444,6451 ****
+--- 6444,6453 ----
+ {
+ vim_free(last_insert);
+ last_insert = NULL;
++ # ifdef FEAT_INS_EXPAND
+ vim_free(compl_orig_text);
+ compl_orig_text = NULL;
++ # endif
+ }
+ #endif
+
+*** ../vim-7.1.160/src/misc2.c Thu Nov 8 20:47:34 2007
+--- src/misc2.c Sat Nov 24 15:01:46 2007
+***************
+*** 964,970 ****
+ {
+ buf_T *buf, *nextbuf;
+ static int entered = FALSE;
+- win_T *win;
+
+ /* When we cause a crash here it is caught and Vim tries to exit cleanly.
+ * Don't try freeing everything again. */
+--- 965,970 ----
+***************
+*** 972,986 ****
<<Diff was trimmed, longer than 597 lines>>
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
