SOURCES: 7.1.064 (NEW), 7.1.065 (NEW), 7.1.066 (NEW), 7.1.067 (NEW...
adamg
adamg at pld-linux.org
Thu Sep 6 23:29:18 CEST 2007
Author: adamg Date: Thu Sep 6 21:29:18 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new
---- Files affected:
SOURCES:
7.1.064 (NONE -> 1.1) (NEW), 7.1.065 (NONE -> 1.1) (NEW), 7.1.066 (NONE -> 1.1) (NEW), 7.1.067 (NONE -> 1.1) (NEW), 7.1.068 (NONE -> 1.1) (NEW), 7.1.069 (NONE -> 1.1) (NEW), 7.1.070 (NONE -> 1.1) (NEW), 7.1.071 (NONE -> 1.1) (NEW), 7.1.072 (NONE -> 1.1) (NEW), 7.1.073 (NONE -> 1.1) (NEW), 7.1.074 (NONE -> 1.1) (NEW), 7.1.075 (NONE -> 1.1) (NEW), 7.1.076 (NONE -> 1.1) (NEW), 7.1.077 (NONE -> 1.1) (NEW), 7.1.078 (NONE -> 1.1) (NEW), 7.1.079 (NONE -> 1.1) (NEW), 7.1.080 (NONE -> 1.1) (NEW), 7.1.081 (NONE -> 1.1) (NEW), 7.1.082 (NONE -> 1.1) (NEW), 7.1.083 (NONE -> 1.1) (NEW), 7.1.084 (NONE -> 1.1) (NEW), 7.1.085 (NONE -> 1.1) (NEW), 7.1.086 (NONE -> 1.1) (NEW), 7.1.087 (NONE -> 1.1) (NEW), 7.1.088 (NONE -> 1.1) (NEW), 7.1.089 (NONE -> 1.1) (NEW), 7.1.090 (NONE -> 1.1) (NEW), 7.1.091 (NONE -> 1.1) (NEW), 7.1.092 (NONE -> 1.1) (NEW), 7.1.093 (NONE -> 1.1) (NEW), 7.1.094 (NONE -> 1.1) (NEW), 7.1.095 (NONE -> 1.1) (NEW), 7.1.096 (NONE -> 1.1) (NEW
), 7.1.097 (NONE -> 1.1) (NEW), 7.1.098 (NONE -> 1.1) (NEW), 7.1.099 (NONE -> 1.1) (NEW), 7.1.100 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/7.1.064
diff -u /dev/null SOURCES/7.1.064:1.1
--- /dev/null Thu Sep 6 23:29:18 2007
+++ SOURCES/7.1.064 Thu Sep 6 23:29:13 2007
@@ -0,0 +1,50 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.064
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.064
+Problem: On Interix some files appear not to exist.
+Solution: Remove the top bit from st_mode. (Ligesh)
+Files: src/os_unix.c
+
+
+*** ../vim-7.1.063/src/os_unix.c Thu May 10 19:42:47 2007
+--- src/os_unix.c Fri Aug 10 19:32:20 2007
+***************
+*** 2499,2505 ****
+--- 2499,2511 ----
+ if (stat((char *)name, &statb))
+ #endif
+ return -1;
++ #ifdef __INTERIX
++ /* The top bit makes the value negative, which means the file doesn't
++ * exist. Remove the bit, we don't use it. */
++ return statb.st_mode & ~S_ADDACE;
++ #else
+ return statb.st_mode;
++ #endif
+ }
+
+ /*
+*** ../vim-7.1.063/src/version.c Sat Aug 11 15:59:44 2007
+--- src/version.c Sat Aug 11 22:21:35 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 64,
+ /**/
+
+--
+I have a watch cat! Just break in and she'll watch.
+
+ /// Bram Moolenaar -- Bram at 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 ///
================================================================
Index: SOURCES/7.1.065
diff -u /dev/null SOURCES/7.1.065:1.1
--- /dev/null Thu Sep 6 23:29:18 2007
+++ SOURCES/7.1.065 Thu Sep 6 23:29:13 2007
@@ -0,0 +1,113 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.065 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.065 (extra)
+Problem: Win32: Compilation problem for newer version of w32api.
+Solution: Only define __IID_DEFINED__ when needed. (Chris Sutcliffe)
+Files: src/Make_ming.mak, src/iid_ole.c
+
+
+*** ../vim-7.1.064/src/Make_ming.mak Thu May 10 19:35:54 2007
+--- src/Make_ming.mak Sat Aug 11 14:52:11 2007
+***************
+*** 572,579 ****
+ $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
+ $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
+
+ $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
+! $(CC) $(CFLAGS) -D__IID_DEFINED__ -c -o $(OUTDIR)/if_ole.o if_ole.cpp
+
+ $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
+ ifeq (16, $(RUBY))
+--- 572,580 ----
+ $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
+ $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
+
++ # Remove -D__IID_DEFINED__ for newer versions of the w32api
+ $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
+! $(CC) $(CFLAGS) -c -o $(OUTDIR)/if_ole.o if_ole.cpp
+
+ $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
+ ifeq (16, $(RUBY))
+*** ../vim-7.1.064/src/iid_ole.c Sun Jun 13 18:45:30 2004
+--- src/iid_ole.c Sat Aug 11 14:57:58 2007
+***************
+*** 16,24 ****
+ extern "C"{
+ #endif
+
+
+ #ifndef __IID_DEFINED__
+! #define __IID_DEFINED__
+
+ typedef struct _IID
+ {
+--- 16,33 ----
+ extern "C"{
+ #endif
+
++ #ifdef __MINGW32__
++ # include <w32api.h>
++
++ # if __W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 10
++ /* This define is missing from older MingW versions of w32api, even though
++ * IID is defined. */
++ # define __IID_DEFINED__
++ # endif
++ #endif
+
+ #ifndef __IID_DEFINED__
+! # define __IID_DEFINED__
+
+ typedef struct _IID
+ {
+***************
+*** 28,39 ****
+ unsigned char c[8];
+ } IID;
+
+! #endif // __IID_DEFINED__
+
+ #ifndef CLSID_DEFINED
+! #define CLSID_DEFINED
+ typedef IID CLSID;
+! #endif // CLSID_DEFINED
+
+ const IID IID_IVim = {0x0F0BFAE2,0x4C90,0x11d1,{0x82,0xD7,0x00,0x04,0xAC,0x36,0x85,0x19}};
+
+--- 37,48 ----
+ unsigned char c[8];
+ } IID;
+
+! #endif
+
+ #ifndef CLSID_DEFINED
+! # define CLSID_DEFINED
+ typedef IID CLSID;
+! #endif
+
+ const IID IID_IVim = {0x0F0BFAE2,0x4C90,0x11d1,{0x82,0xD7,0x00,0x04,0xAC,0x36,0x85,0x19}};
+
+*** ../vim-7.1.064/src/version.c Sat Aug 11 22:22:56 2007
+--- src/version.c Sun Aug 12 15:21:34 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 65,
+ /**/
+
+--
+I'm writing a book. I've got the page numbers done.
+
+ /// Bram Moolenaar -- Bram at 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 ///
================================================================
Index: SOURCES/7.1.066
diff -u /dev/null SOURCES/7.1.066:1.1
--- /dev/null Thu Sep 6 23:29:18 2007
+++ SOURCES/7.1.066 Thu Sep 6 23:29:13 2007
@@ -0,0 +1,152 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.066
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.066
+Problem: When 'bomb' is set or reset the file should be considered
+ modified. (Tony Mechelynck)
+Solution: Handle like 'endofline'. (Martin Toft)
+Files: src/buffer.c, src/fileio.c, src/option.c, src/structs.h
+
+
+*** ../vim-7.1.065/src/buffer.c Mon Aug 6 22:27:12 2007
+--- src/buffer.c Sat Aug 11 16:56:57 2007
+***************
+*** 502,507 ****
+--- 502,508 ----
+ buf->b_start_eol = TRUE;
+ #ifdef FEAT_MBYTE
+ buf->b_p_bomb = FALSE;
++ buf->b_start_bomb = FALSE;
+ #endif
+ buf->b_ml.ml_mfp = NULL;
+ buf->b_ml.ml_flags = ML_EMPTY; /* empty buffer */
+*** ../vim-7.1.065/src/fileio.c Tue Jul 10 17:09:51 2007
+--- src/fileio.c Sat Aug 11 16:56:57 2007
+***************
+*** 654,659 ****
+--- 654,660 ----
+ curbuf->b_start_eol = TRUE;
+ #ifdef FEAT_MBYTE
+ curbuf->b_p_bomb = FALSE;
++ curbuf->b_start_bomb = FALSE;
+ #endif
+ }
+
+***************
+*** 912,918 ****
+--- 913,922 ----
+ file_rewind = FALSE;
+ #ifdef FEAT_MBYTE
+ if (set_options)
++ {
+ curbuf->b_p_bomb = FALSE;
++ curbuf->b_start_bomb = FALSE;
++ }
+ conv_error = 0;
+ #endif
+ }
+***************
+*** 1361,1367 ****
+--- 1365,1374 ----
+ size -= blen;
+ mch_memmove(ptr, ptr + blen, (size_t)size);
+ if (set_options)
++ {
+ curbuf->b_p_bomb = TRUE;
++ curbuf->b_start_bomb = TRUE;
++ }
+ }
+
+ if (fio_flags == FIO_UCSBOM)
+*** ../vim-7.1.065/src/option.c Tue Jul 24 14:57:16 2007
+--- src/option.c Sat Aug 11 16:56:57 2007
+***************
+*** 7118,7123 ****
+--- 7118,7128 ----
+ /* when 'endofline' is changed, redraw the window title */
+ else if ((int *)varp == &curbuf->b_p_eol)
+ need_maketitle = TRUE;
++ #ifdef FEAT_MBYTE
++ /* when 'bomb' is changed, redraw the window title */
++ else if ((int *)varp == &curbuf->b_p_bomb)
++ need_maketitle = TRUE;
++ #endif
+ #endif
+
+ /* when 'bin' is set also set some other options */
+***************
+*** 10604,10609 ****
+--- 10609,10616 ----
+ buf->b_start_ffc = *buf->b_p_ff;
+ buf->b_start_eol = buf->b_p_eol;
+ #ifdef FEAT_MBYTE
++ buf->b_start_bomb = buf->b_p_bomb;
++
+ /* Only use free/alloc when necessary, they take time. */
+ if (buf->b_start_fenc == NULL
+ || STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0)
+***************
+*** 10617,10623 ****
+ /*
+ * Return TRUE if 'fileformat' and/or 'fileencoding' has a different value
+ * from when editing started (save_file_ff() called).
+! * Also when 'endofline' was changed and 'binary' is set.
+ * Don't consider a new, empty buffer to be changed.
+ */
+ int
+--- 10624,10631 ----
+ /*
+ * Return TRUE if 'fileformat' and/or 'fileencoding' has a different value
+ * from when editing started (save_file_ff() called).
+! * Also when 'endofline' was changed and 'binary' is set, or when 'bomb' was
+! * changed and 'binary' is not set.
+ * Don't consider a new, empty buffer to be changed.
+ */
+ int
+***************
+*** 10636,10641 ****
+--- 10644,10651 ----
+ if (buf->b_p_bin && buf->b_start_eol != buf->b_p_eol)
+ return TRUE;
+ #ifdef FEAT_MBYTE
++ if (!buf->b_p_bin && buf->b_start_bomb != buf->b_p_bomb)
++ return TRUE;
+ if (buf->b_start_fenc == NULL)
+ return (*buf->b_p_fenc != NUL);
+ return (STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0);
+*** ../vim-7.1.065/src/structs.h Thu Jul 26 22:55:11 2007
+--- src/structs.h Sat Aug 11 16:56:57 2007
+***************
+*** 1453,1458 ****
+--- 1453,1459 ----
+ #ifdef FEAT_MBYTE
+ char_u *b_start_fenc; /* 'fileencoding' when edit started or NULL */
+ int b_bad_char; /* "++bad=" argument when edit started or 0 */
++ int b_start_bomb; /* 'bomb' when it was read */
+ #endif
+
+ #ifdef FEAT_EVAL
+*** ../vim-7.1.065/src/version.c Sun Aug 12 15:24:05 2007
+--- src/version.c Sun Aug 12 15:48:34 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 66,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+127. You bring your laptop and cellular phone to church.
+
+ /// Bram Moolenaar -- Bram at 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 ///
================================================================
Index: SOURCES/7.1.067
diff -u /dev/null SOURCES/7.1.067:1.1
--- /dev/null Thu Sep 6 23:29:18 2007
+++ SOURCES/7.1.067 Thu Sep 6 23:29:13 2007
@@ -0,0 +1,302 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.067
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.067
+Problem: 'thesaurus' doesn't work when 'infercase' is set. (Mohsin)
+Solution: Don't copy the characters being completed but check the case and
+ apply it to the suggested word. Also fix that the first word in
+ the thesaurus line is not used. (Martin Toft)
+Files: src/edit.c
+
+
+*** ../vim-7.1.066/src/edit.c Sun Jul 29 15:02:34 2007
+--- src/edit.c Sat Aug 11 17:16:51 2007
+***************
+*** 2057,2063 ****
+ * case of the originally typed text is used, and the case of the completed
+ * text is inferred, ie this tries to work out what case you probably wanted
+ * the rest of the word to be in -- webb
+- * TODO: make this work for multi-byte characters.
+ */
+ int
+ ins_compl_add_infercase(str, len, icase, fname, dir, flags)
+--- 2057,2062 ----
+***************
+*** 2068,2121 ****
+ int dir;
+ int flags;
+ {
+ int has_lower = FALSE;
+ int was_letter = FALSE;
+- int idx;
+
+! if (p_ic && curbuf->b_p_inf && len < IOSIZE)
+ {
+! /* Infer case of completed part -- webb */
+! /* Use IObuff, str would change text in buffer! */
+! vim_strncpy(IObuff, str, len);
+
+! /* Rule 1: Were any chars converted to lower? */
+! for (idx = 0; idx < compl_length; ++idx)
+ {
+! if (islower(compl_orig_text[idx]))
+ {
+! has_lower = TRUE;
+! if (isupper(IObuff[idx]))
+! {
+! /* Rule 1 is satisfied */
+! for (idx = compl_length; idx < len; ++idx)
+! IObuff[idx] = TOLOWER_LOC(IObuff[idx]);
+! break;
+! }
+ }
+ }
+
+! /*
+! * Rule 2: No lower case, 2nd consecutive letter converted to
+! * upper case.
+! */
+! if (!has_lower)
+ {
+! for (idx = 0; idx < compl_length; ++idx)
+ {
+! if (was_letter && isupper(compl_orig_text[idx])
+! && islower(IObuff[idx]))
+ {
+! /* Rule 2 is satisfied */
+! for (idx = compl_length; idx < len; ++idx)
+! IObuff[idx] = TOUPPER_LOC(IObuff[idx]);
+! break;
+ }
+- was_letter = isalpha(compl_orig_text[idx]);
+ }
+- }
+
+! /* Copy the original case of the part we typed */
+! STRNCPY(IObuff, compl_orig_text, compl_length);
+
+ return ins_compl_add(IObuff, len, icase, fname, NULL, dir,
+ flags, FALSE);
+--- 2067,2213 ----
+ int dir;
+ int flags;
+ {
++ char_u *p;
++ int i, c;
++ int actual_len; /* Take multi-byte characters */
++ int actual_compl_length; /* into account. */
++ int *wca; /* Wide character array. */
+ int has_lower = FALSE;
+ int was_letter = FALSE;
+
+! if (p_ic && curbuf->b_p_inf)
+ {
+! /* Infer case of completed part. */
+
+! /* Find actual length of completion. */
+! #ifdef FEAT_MBYTE
+! if (has_mbyte)
+ {
+! p = str;
+! actual_len = 0;
+! while (*p != NUL)
+ {
+! mb_ptr_adv(p);
+! ++actual_len;
+ }
+ }
++ else
++ #endif
++ actual_len = len;
+
+! /* Find actual length of original text. */
+! #ifdef FEAT_MBYTE
+! if (has_mbyte)
+ {
+! p = compl_orig_text;
+! actual_compl_length = 0;
+! while (*p != NUL)
+ {
+! mb_ptr_adv(p);
+! ++actual_compl_length;
+! }
+! }
+! else
+! #endif
+! actual_compl_length = compl_length;
+!
+! /* Allocate wide character array for the completion and fill it. */
+! wca = (int *)alloc(actual_len * sizeof(int));
+! if (wca != NULL)
+! {
+! p = str;
+! for (i = 0; i < actual_len; ++i)
+! #ifdef FEAT_MBYTE
+! if (has_mbyte)
+! wca[i] = mb_ptr2char_adv(&p);
+! else
+! #endif
+! wca[i] = *(p++);
+!
+! /* Rule 1: Were any chars converted to lower? */
+! p = compl_orig_text;
+! for (i = 0; i < actual_compl_length; ++i)
+! {
+! #ifdef FEAT_MBYTE
+! if (has_mbyte)
+! c = mb_ptr2char_adv(&p);
+! else
+! #endif
+! c = *(p++);
+! if (MB_ISLOWER(c))
+ {
+! has_lower = TRUE;
+! if (MB_ISUPPER(wca[i]))
+! {
+! /* Rule 1 is satisfied. */
+! for (i = actual_compl_length; i < actual_len; ++i)
+! wca[i] = MB_TOLOWER(wca[i]);
+! break;
+! }
+ }
+ }
+
+! /*
+! * Rule 2: No lower case, 2nd consecutive letter converted to
+! * upper case.
+! */
+! if (!has_lower)
+! {
+! p = compl_orig_text;
+! for (i = 0; i < actual_compl_length; ++i)
+! {
+! #ifdef FEAT_MBYTE
+! if (has_mbyte)
+! c = mb_ptr2char_adv(&p);
+! else
+! #endif
+! c = *(p++);
+! if (was_letter && MB_ISUPPER(c) && MB_ISLOWER(wca[i]))
+! {
+! /* Rule 2 is satisfied. */
+! for (i = actual_compl_length; i < actual_len; ++i)
+! wca[i] = MB_TOUPPER(wca[i]);
+! break;
+! }
+! was_letter = MB_ISLOWER(c) || MB_ISUPPER(c);
+! }
+! }
+!
+! /* Copy the original case of the part we typed. */
+! p = compl_orig_text;
+! for (i = 0; i < actual_compl_length; ++i)
+! {
+! #ifdef FEAT_MBYTE
+! if (has_mbyte)
+! c = mb_ptr2char_adv(&p);
+! else
+! #endif
+! c = *(p++);
+! if (MB_ISLOWER(c))
+! wca[i] = MB_TOLOWER(wca[i]);
+! else if (MB_ISUPPER(c))
+! wca[i] = MB_TOUPPER(wca[i]);
+! }
+!
+! /*
+! * Generate encoding specific output from wide character array.
+! * Multi-byte characters can occupy up to five bytes more than
+! * ASCII characters, and we also need one byte for NUL, so stay
+! * six bytes away from the edge of IObuff.
+! */
+! p = IObuff;
+! i = 0;
+! 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++];
+! *p = NUL;
+!
+! vim_free(wca);
+! }
+
+ return ins_compl_add(IObuff, len, icase, fname, NULL, dir,
+ flags, FALSE);
+***************
+*** 2842,2847 ****
+--- 2934,2940 ----
+ /*
+ * Add the other matches on the line
+ */
++ ptr = buf;
+ while (!got_int)
+ {
+ /* Find start of the next word. Skip white
+***************
+*** 2851,2857 ****
+ break;
+ wstart = ptr;
+
+! /* Find end of the word and add it. */
+ #ifdef FEAT_MBYTE
+ if (has_mbyte)
+ /* Japanese words may have characters in
+--- 2944,2950 ----
+ break;
+ wstart = ptr;
+
+! /* Find end of the word. */
+ #ifdef FEAT_MBYTE
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list