Changeset 7352c10 for patches/vim-7.2-branch_update-5.patch
- Timestamp:
- Jan 19, 2009, 12:16:00 AM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 384af06
- Parents:
- 39806f8b
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/vim-7.2-branch_update-5.patch
r39806f8b r7352c10 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01- 08-20092 Date: 01-19-2009 3 3 Initial Package Version: 7.2 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 7.2.0 796 Description: Contains all upstream patches up to 7.2.084 7 7 The following patches were skipped 8 8 007 036 041 049 071 072 074 … … 10 10 diff -Naur vim72.orig/Filelist vim72/Filelist 11 11 --- vim72.orig/Filelist 2008-07-06 11:02:23.000000000 -0700 12 +++ vim72/Filelist 2009-01- 08 20:57:31.000000000 -080012 +++ vim72/Filelist 2009-01-19 00:08:05.000000000 -0800 13 13 @@ -285,6 +285,7 @@ 14 14 src/proto/os_win32.pro \ … … 21 21 diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt 22 22 --- vim72.orig/runtime/doc/cmdline.txt 2008-08-09 07:22:59.000000000 -0700 23 +++ vim72/runtime/doc/cmdline.txt 2009-01- 08 20:57:32.000000000 -080023 +++ vim72/runtime/doc/cmdline.txt 2009-01-19 00:08:30.000000000 -0800 24 24 @@ -1,4 +1,4 @@ 25 25 -*cmdline.txt* For Vim version 7.2. Last change: 2008 Jul 29 … … 80 80 diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt 81 81 --- vim72.orig/runtime/doc/eval.txt 2008-08-09 07:22:59.000000000 -0700 82 +++ vim72/runtime/doc/eval.txt 2009-01- 08 20:57:45.000000000 -080082 +++ vim72/runtime/doc/eval.txt 2009-01-19 00:10:10.000000000 -0800 83 83 @@ -1,4 +1,4 @@ 84 84 -*eval.txt* For Vim version 7.2. Last change: 2008 Aug 09 … … 200 200 diff -Naur vim72.orig/runtime/doc/netbeans.txt vim72/runtime/doc/netbeans.txt 201 201 --- vim72.orig/runtime/doc/netbeans.txt 2008-08-09 07:22:59.000000000 -0700 202 +++ vim72/runtime/doc/netbeans.txt 2009-01- 08 20:57:54.000000000 -0800202 +++ vim72/runtime/doc/netbeans.txt 2009-01-19 00:10:45.000000000 -0800 203 203 @@ -1,4 +1,4 @@ 204 204 -*netbeans.txt* For Vim version 7.2. Last change: 2008 Jun 28 … … 222 222 diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt 223 223 --- vim72.orig/runtime/doc/options.txt 2008-08-09 07:22:59.000000000 -0700 224 +++ vim72/runtime/doc/options.txt 2009-01- 08 20:57:43.000000000 -0800224 +++ vim72/runtime/doc/options.txt 2009-01-19 00:09:28.000000000 -0800 225 225 @@ -1,4 +1,4 @@ 226 226 -*options.txt* For Vim version 7.2. Last change: 2008 Aug 06 … … 242 242 diff -Naur vim72.orig/runtime/doc/spell.txt vim72/runtime/doc/spell.txt 243 243 --- vim72.orig/runtime/doc/spell.txt 2008-08-09 07:23:00.000000000 -0700 244 +++ vim72/runtime/doc/spell.txt 2009-01- 08 20:57:45.000000000 -0800244 +++ vim72/runtime/doc/spell.txt 2009-01-19 00:09:54.000000000 -0800 245 245 @@ -1,4 +1,4 @@ 246 246 -*spell.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 372 372 diff -Naur vim72.orig/runtime/doc/starting.txt vim72/runtime/doc/starting.txt 373 373 --- vim72.orig/runtime/doc/starting.txt 2008-08-09 07:23:00.000000000 -0700 374 +++ vim72/runtime/doc/starting.txt 2009-01- 08 20:57:32.000000000 -0800374 +++ vim72/runtime/doc/starting.txt 2009-01-19 00:08:31.000000000 -0800 375 375 @@ -1,4 +1,4 @@ 376 376 -*starting.txt* For Vim version 7.2. Last change: 2008 Jun 21 … … 434 434 diff -Naur vim72.orig/runtime/doc/usr_21.txt vim72/runtime/doc/usr_21.txt 435 435 --- vim72.orig/runtime/doc/usr_21.txt 2008-08-09 07:23:01.000000000 -0700 436 +++ vim72/runtime/doc/usr_21.txt 2009-01- 08 20:57:32.000000000 -0800436 +++ vim72/runtime/doc/usr_21.txt 2009-01-19 00:08:31.000000000 -0800 437 437 @@ -1,4 +1,4 @@ 438 438 -*usr_21.txt* For Vim version 7.2. Last change: 2007 May 01 … … 501 501 diff -Naur vim72.orig/runtime/scripts.vim vim72/runtime/scripts.vim 502 502 --- vim72.orig/runtime/scripts.vim 2008-08-08 15:27:21.000000000 -0700 503 +++ vim72/runtime/scripts.vim 2009-01- 08 20:57:27.000000000 -0800503 +++ vim72/runtime/scripts.vim 2009-01-19 00:07:18.000000000 -0800 504 504 @@ -234,6 +234,10 @@ 505 505 elseif s:line1 =~ '\<DTD\s\+XHTML\s' … … 515 515 diff -Naur vim72.orig/src/auto/configure vim72/src/auto/configure 516 516 --- vim72.orig/src/auto/configure 2008-07-24 05:40:36.000000000 -0700 517 +++ vim72/src/auto/configure 2009-01- 08 20:57:39.000000000 -0800517 +++ vim72/src/auto/configure 2009-01-19 00:09:07.000000000 -0800 518 518 @@ -16819,21 +16819,29 @@ 519 519 LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" … … 556 556 diff -Naur vim72.orig/src/buffer.c vim72/src/buffer.c 557 557 --- vim72.orig/src/buffer.c 2008-08-06 04:00:48.000000000 -0700 558 +++ vim72/src/buffer.c 2009-01- 08 20:57:54.000000000 -0800558 +++ vim72/src/buffer.c 2009-01-19 00:10:45.000000000 -0800 559 559 @@ -437,10 +437,6 @@ 560 560 return; … … 674 674 diff -Naur vim72.orig/src/configure.in vim72/src/configure.in 675 675 --- vim72.orig/src/configure.in 2008-07-24 05:40:26.000000000 -0700 676 +++ vim72/src/configure.in 2009-01- 08 20:57:39.000000000 -0800676 +++ vim72/src/configure.in 2009-01-19 00:09:07.000000000 -0800 677 677 @@ -3152,18 +3152,25 @@ 678 678 dnl But only when making dependencies, cproto and lint don't take "-isystem". … … 709 709 diff -Naur vim72.orig/src/diff.c vim72/src/diff.c 710 710 --- vim72.orig/src/diff.c 2008-03-05 03:16:56.000000000 -0800 711 +++ vim72/src/diff.c 2009-01- 08 20:57:45.000000000 -0800711 +++ vim72/src/diff.c 2009-01-19 00:09:50.000000000 -0800 712 712 @@ -73,6 +73,8 @@ 713 713 { … … 797 797 } 798 798 #endif 799 diff -Naur vim72.orig/src/edit.c vim72/src/edit.c 800 --- vim72.orig/src/edit.c 2008-08-06 05:51:17.000000000 -0700 801 +++ vim72/src/edit.c 2009-01-19 00:10:48.000000000 -0800 802 @@ -147,6 +147,7 @@ 803 static int ins_compl_bs __ARGS((void)); 804 static void ins_compl_new_leader __ARGS((void)); 805 static void ins_compl_addleader __ARGS((int c)); 806 +static int ins_compl_len __ARGS((void)); 807 static void ins_compl_restart __ARGS((void)); 808 static void ins_compl_set_original_text __ARGS((char_u *str)); 809 static void ins_compl_addfrommatch __ARGS((void)); 810 @@ -197,7 +198,8 @@ 811 static void mb_replace_pop_ins __ARGS((int cc)); 812 #endif 813 static void replace_flush __ARGS((void)); 814 -static void replace_do_bs __ARGS((void)); 815 +static void replace_do_bs __ARGS((int limit_col)); 816 +static int del_char_after_col __ARGS((int limit_col)); 817 #ifdef FEAT_CINDENT 818 static int cindent_on __ARGS((void)); 819 #endif 820 @@ -1933,6 +1935,8 @@ 821 /* 822 * Backspace the cursor until the given column. Handles REPLACE and VREPLACE 823 * modes correctly. May also be used when not in insert mode at all. 824 + * Will attempt not to go before "col" even when there is a composing 825 + * character. 826 */ 827 void 828 backspace_until_column(col) 829 @@ -1942,13 +1946,49 @@ 830 { 831 curwin->w_cursor.col--; 832 if (State & REPLACE_FLAG) 833 - replace_do_bs(); 834 - else 835 - (void)del_char(FALSE); 836 + replace_do_bs(col); 837 + else if (!del_char_after_col(col)) 838 + break; 839 } 840 } 841 #endif 842 843 +/* 844 + * Like del_char(), but make sure not to go before column "limit_col". 845 + * Only matters when there are composing characters. 846 + * Return TRUE when something was deleted. 847 + */ 848 + static int 849 +del_char_after_col(limit_col) 850 + int limit_col; 851 +{ 852 +#ifdef FEAT_MBYTE 853 + if (enc_utf8 && limit_col >= 0) 854 + { 855 + int ecol = curwin->w_cursor.col + 1; 856 + 857 + /* Make sure the cursor is at the start of a character, but 858 + * skip forward again when going too far back because of a 859 + * composing character. */ 860 + mb_adjust_cursor(); 861 + while (curwin->w_cursor.col < limit_col) 862 + { 863 + int l = utf_ptr2len(ml_get_cursor()); 864 + 865 + if (l == 0) /* end of line */ 866 + break; 867 + curwin->w_cursor.col += l; 868 + } 869 + if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol) 870 + return FALSE; 871 + del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE); 872 + } 873 + else 874 +#endif 875 + (void)del_char(FALSE); 876 + return TRUE; 877 +} 878 + 879 #if defined(FEAT_INS_EXPAND) || defined(PROTO) 880 /* 881 * CTRL-X pressed in Insert mode. 882 @@ -2418,7 +2458,7 @@ 883 { 884 had_match = (curwin->w_cursor.col > compl_col); 885 ins_compl_delete(); 886 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 887 + ins_bytes(compl_leader + ins_compl_len()); 888 ins_redraw(FALSE); 889 890 /* When the match isn't there (to avoid matching itself) remove it 891 @@ -2470,7 +2510,7 @@ 892 *p = NUL; 893 had_match = (curwin->w_cursor.col > compl_col); 894 ins_compl_delete(); 895 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 896 + ins_bytes(compl_leader + ins_compl_len()); 897 ins_redraw(FALSE); 898 899 /* When the match isn't there (to avoid matching itself) remove it 900 @@ -3209,7 +3249,7 @@ 901 { 902 ins_compl_del_pum(); 903 ins_compl_delete(); 904 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 905 + ins_bytes(compl_leader + ins_compl_len()); 906 compl_used_match = FALSE; 907 908 if (compl_started) 909 @@ -3264,6 +3304,20 @@ 910 } 911 912 /* 913 + * Return the length of the completion, from the completion start column to 914 + * the cursor column. Making sure it never goes below zero. 915 + */ 916 + static int 917 +ins_compl_len() 918 +{ 919 + int off = curwin->w_cursor.col - compl_col; 920 + 921 + if (off < 0) 922 + return 0; 923 + return off; 924 +} 925 + 926 +/* 927 * Append one character to the match leader. May reduce the number of 928 * matches. 929 */ 930 @@ -3621,10 +3675,9 @@ 931 { 932 ins_compl_delete(); 933 if (compl_leader != NULL) 934 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 935 + ins_bytes(compl_leader + ins_compl_len()); 936 else if (compl_first_match != NULL) 937 - ins_bytes(compl_orig_text 938 - + curwin->w_cursor.col - compl_col); 939 + ins_bytes(compl_orig_text + ins_compl_len()); 940 retval = TRUE; 941 } 942 943 @@ -4256,7 +4309,7 @@ 944 static void 945 ins_compl_insert() 946 { 947 - ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col); 948 + ins_bytes(compl_shown_match->cp_str + ins_compl_len()); 949 if (compl_shown_match->cp_flags & ORIGINAL_TEXT) 950 compl_used_match = FALSE; 951 else 952 @@ -4425,7 +4478,7 @@ 953 if (!compl_get_longest || compl_used_match) 954 ins_compl_insert(); 955 else 956 - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); 957 + ins_bytes(compl_leader + ins_compl_len()); 958 } 959 else 960 compl_used_match = FALSE; 961 @@ -7123,9 +7176,12 @@ 962 * cc == 0: character was inserted, delete it 963 * cc > 0: character was replaced, put cc (first byte of original char) back 964 * and check for more characters to be put back 965 + * When "limit_col" is >= 0, don't delete before this column. Matters when 966 + * using composing characters, use del_char_after_col() instead of del_char(). 967 */ 968 static void 969 -replace_do_bs() 970 +replace_do_bs(limit_col) 971 + int limit_col; 972 { 973 int cc; 974 #ifdef FEAT_VREPLACE 975 @@ -7153,7 +7209,7 @@ 976 #ifdef FEAT_MBYTE 977 if (has_mbyte) 978 { 979 - del_char(FALSE); 980 + (void)del_char_after_col(limit_col); 981 # ifdef FEAT_VREPLACE 982 if (State & VREPLACE_FLAG) 983 orig_len = (int)STRLEN(ml_get_cursor()); 984 @@ -7203,7 +7259,7 @@ 985 changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col); 986 } 987 else if (cc == 0) 988 - (void)del_char(FALSE); 989 + (void)del_char_after_col(limit_col); 990 } 991 992 #ifdef FEAT_CINDENT 993 @@ -8239,7 +8295,7 @@ 994 * Replace mode */ 995 if (curwin->w_cursor.lnum != Insstart.lnum 996 || curwin->w_cursor.col >= Insstart.col) 997 - replace_do_bs(); 998 + replace_do_bs(-1); 999 } 1000 else 1001 (void)del_char(FALSE); 1002 @@ -8556,7 +8612,7 @@ 1003 break; 1004 } 1005 if (State & REPLACE_FLAG) 1006 - replace_do_bs(); 1007 + replace_do_bs(-1); 1008 else 1009 { 1010 #ifdef FEAT_MBYTE 799 1011 diff -Naur vim72.orig/src/eval.c vim72/src/eval.c 800 1012 --- vim72.orig/src/eval.c 2008-08-07 12:37:22.000000000 -0700 801 +++ vim72/src/eval.c 2009-01- 08 20:57:46.000000000 -08001013 +++ vim72/src/eval.c 2009-01-19 00:10:21.000000000 -0800 802 1014 @@ -32,6 +32,9 @@ 803 1015 … … 1623 1835 diff -Naur vim72.orig/src/ex_cmds.c vim72/src/ex_cmds.c 1624 1836 --- vim72.orig/src/ex_cmds.c 2008-08-04 12:15:00.000000000 -0700 1625 +++ vim72/src/ex_cmds.c 2009-01- 08 20:57:44.000000000 -08001837 +++ vim72/src/ex_cmds.c 2009-01-19 00:10:54.000000000 -0800 1626 1838 @@ -24,7 +24,7 @@ 1627 1839 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out)); … … 1633 1845 static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing)); 1634 1846 #endif 1635 @@ -1676,14 +1676,12 @@ 1847 @@ -49,6 +49,7 @@ 1848 exarg_T *eap; 1849 { 1850 int c; 1851 + int cval; 1852 char buf1[20]; 1853 char buf2[20]; 1854 char_u buf3[7]; 1855 @@ -75,6 +76,10 @@ 1856 { 1857 if (c == NL) /* NUL is stored as NL */ 1858 c = NUL; 1859 + if (c == CAR && get_fileformat(curbuf) == EOL_MAC) 1860 + cval = NL; /* NL is stored as CR */ 1861 + else 1862 + cval = c; 1863 if (vim_isprintc_strict(c) && (c < ' ' 1864 #ifndef EBCDIC 1865 || c > '~' 1866 @@ -94,7 +99,7 @@ 1867 buf2[0] = NUL; 1868 vim_snprintf((char *)IObuff, IOSIZE, 1869 _("<%s>%s%s %d, Hex %02x, Octal %03o"), 1870 - transchar(c), buf1, buf2, c, c, c); 1871 + transchar(c), buf1, buf2, cval, cval, cval); 1872 #ifdef FEAT_MBYTE 1873 if (enc_utf8) 1874 c = cc[ci++]; 1875 @@ -1676,14 +1681,12 @@ 1636 1876 1637 1877 /* … … 1652 1892 FILE *fp; 1653 1893 char_u *fname; 1654 @@ -1691,7 +16 89,7 @@1894 @@ -1691,7 +1694,7 @@ 1655 1895 if (no_viminfo()) 1656 1896 return FAIL; … … 1661 1901 return FAIL; 1662 1902 fp = mch_fopen((char *)fname, READBIN); 1663 @@ -1701,8 +1 699,9 @@1903 @@ -1701,8 +1704,9 @@ 1664 1904 verbose_enter(); 1665 1905 smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"), … … 1673 1913 verbose_leave(); 1674 1914 } 1675 @@ -1712,10 +171 1,9 @@1915 @@ -1712,10 +1716,9 @@ 1676 1916 return FAIL; 1677 1917 … … 1685 1925 } 1686 1926 1687 @@ -1943,7 +194 1,7 @@1927 @@ -1943,7 +1946,7 @@ 1688 1928 * root. 1689 1929 */ … … 1694 1934 } 1695 1935 } 1696 @@ -1968,7 +19 66,7 @@1936 @@ -1968,7 +1971,7 @@ 1697 1937 } 1698 1938 … … 1703 1943 fclose(fp_out); /* errors are ignored !? */ 1704 1944 if (fp_in != NULL) 1705 @@ -2041,12 +20 39,10 @@1945 @@ -2041,12 +2044,10 @@ 1706 1946 * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo(). 1707 1947 */ … … 1718 1958 int count = 0; 1719 1959 int eof = FALSE; 1720 @@ -2061,8 +20 57,9 @@1960 @@ -2061,8 +2062,9 @@ 1721 1961 1722 1962 if (fp_in != NULL) … … 1730 1970 /* Skip info, find start of marks */ 1731 1971 while (!(eof = viminfo_readline(&vir)) 1732 @@ -2092,8 +20 89,9 @@1972 @@ -2092,8 +2094,9 @@ 1733 1973 write_viminfo_bufferlist(fp_out); 1734 1974 count = write_viminfo_marks(fp_out); … … 1742 1982 vim_free(vir.vir_line); 1743 1983 #ifdef FEAT_MBYTE 1744 @@ -5059,6 +50 57,7 @@1984 @@ -5059,6 +5062,7 @@ 1745 1985 1746 1986 if (did_sub) … … 1752 1992 diff -Naur vim72.orig/src/ex_cmds.h vim72/src/ex_cmds.h 1753 1993 --- vim72.orig/src/ex_cmds.h 2008-06-21 11:47:57.000000000 -0700 1754 +++ vim72/src/ex_cmds.h 2009-01- 08 20:57:32.000000000 -08001994 +++ vim72/src/ex_cmds.h 2009-01-19 00:08:31.000000000 -0800 1755 1995 @@ -278,7 +278,7 @@ 1756 1996 EX(CMD_crewind, "crewind", ex_cc, … … 1800 2040 diff -Naur vim72.orig/src/ex_cmds2.c vim72/src/ex_cmds2.c 1801 2041 --- vim72.orig/src/ex_cmds2.c 2008-07-13 09:18:22.000000000 -0700 1802 +++ vim72/src/ex_cmds2.c 2009-01- 08 20:57:30.000000000 -08002042 +++ vim72/src/ex_cmds2.c 2009-01-19 00:07:35.000000000 -0800 1803 2043 @@ -3145,8 +3145,8 @@ 1804 2044 verbose_leave(); … … 1814 2054 diff -Naur vim72.orig/src/ex_docmd.c vim72/src/ex_docmd.c 1815 2055 --- vim72.orig/src/ex_docmd.c 2008-07-26 04:51:05.000000000 -0700 1816 +++ vim72/src/ex_docmd.c 2009-01- 08 20:57:45.000000000 -08002056 +++ vim72/src/ex_docmd.c 2009-01-19 00:10:13.000000000 -0800 1817 2057 @@ -364,6 +364,7 @@ 1818 2058 # define ex_function ex_ni … … 1957 2197 diff -Naur vim72.orig/src/ex_getln.c vim72/src/ex_getln.c 1958 2198 --- vim72.orig/src/ex_getln.c 2008-08-08 02:31:33.000000000 -0700 1959 +++ vim72/src/ex_getln.c 2009-01- 08 20:57:43.000000000 -08002199 +++ vim72/src/ex_getln.c 2009-01-19 00:09:28.000000000 -0800 1960 2200 @@ -31,6 +31,8 @@ 1961 2201 int cmdattr; /* attributes for prompt */ … … 2091 2331 diff -Naur vim72.orig/src/feature.h vim72/src/feature.h 2092 2332 --- vim72.orig/src/feature.h 2008-08-06 04:00:39.000000000 -0700 2093 +++ vim72/src/feature.h 2009-01- 08 20:57:32.000000000 -08002333 +++ vim72/src/feature.h 2009-01-19 00:08:31.000000000 -0800 2094 2334 @@ -767,9 +767,13 @@ 2095 2335 … … 2110 2350 diff -Naur vim72.orig/src/fileio.c vim72/src/fileio.c 2111 2351 --- vim72.orig/src/fileio.c 2008-08-06 04:01:03.000000000 -0700 2112 +++ vim72/src/fileio.c 2009-01- 08 20:57:54.000000000 -08002352 +++ vim72/src/fileio.c 2009-01-19 00:10:40.000000000 -0800 2113 2353 @@ -932,7 +932,10 @@ 2114 2354 else … … 2340 2580 diff -Naur vim72.orig/src/fold.c vim72/src/fold.c 2341 2581 --- vim72.orig/src/fold.c 2008-08-06 04:01:12.000000000 -0700 2342 +++ vim72/src/fold.c 2009-01- 08 20:57:54.000000000 -08002582 +++ vim72/src/fold.c 2009-01-19 00:10:42.000000000 -0800 2343 2583 @@ -48,7 +48,7 @@ 2344 2584 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp)); … … 2429 2669 diff -Naur vim72.orig/src/getchar.c vim72/src/getchar.c 2430 2670 --- vim72.orig/src/getchar.c 2008-07-22 09:57:48.000000000 -0700 2431 +++ vim72/src/getchar.c 2009-01- 08 20:57:43.000000000 -08002671 +++ vim72/src/getchar.c 2009-01-19 00:09:36.000000000 -0800 2432 2672 @@ -4702,7 +4702,7 @@ 2433 2673 return FAIL; … … 2450 2690 diff -Naur vim72.orig/src/globals.h vim72/src/globals.h 2451 2691 --- vim72.orig/src/globals.h 2008-07-26 04:53:29.000000000 -0700 2452 +++ vim72/src/globals.h 2009-01- 08 20:57:54.000000000 -08002692 +++ vim72/src/globals.h 2009-01-19 00:10:45.000000000 -0800 2453 2693 @@ -1022,6 +1022,7 @@ 2454 2694 #endif … … 2484 2724 diff -Naur vim72.orig/src/gui.c vim72/src/gui.c 2485 2725 --- vim72.orig/src/gui.c 2008-07-27 12:32:14.000000000 -0700 2486 +++ vim72/src/gui.c 2009-01- 08 20:57:45.000000000 -08002726 +++ vim72/src/gui.c 2009-01-19 00:10:07.000000000 -0800 2487 2727 @@ -139,7 +139,7 @@ 2488 2728 /* The read returns when the child closes the pipe (or when … … 2577 2817 diff -Naur vim72.orig/src/gui_at_sb.c vim72/src/gui_at_sb.c 2578 2818 --- vim72.orig/src/gui_at_sb.c 2004-06-07 07:32:25.000000000 -0700 2579 +++ vim72/src/gui_at_sb.c 2009-01- 08 20:57:44.000000000 -08002819 +++ vim72/src/gui_at_sb.c 2009-01-19 00:09:39.000000000 -0800 2580 2820 @@ -1078,6 +1078,12 @@ 2581 2821 Cardinal *num_params; /* unused */ … … 2603 2843 diff -Naur vim72.orig/src/gui_gtk_x11.c vim72/src/gui_gtk_x11.c 2604 2844 --- vim72.orig/src/gui_gtk_x11.c 2008-07-04 03:46:24.000000000 -0700 2605 +++ vim72/src/gui_gtk_x11.c 2009-01- 08 20:57:44.000000000 -08002845 +++ vim72/src/gui_gtk_x11.c 2009-01-19 00:09:39.000000000 -0800 2606 2846 @@ -4070,14 +4070,14 @@ 2607 2847 … … 2627 2867 diff -Naur vim72.orig/src/gui_x11.c vim72/src/gui_x11.c 2628 2868 --- vim72.orig/src/gui_x11.c 2008-06-08 08:13:45.000000000 -0700 2629 +++ vim72/src/gui_x11.c 2009-01- 08 20:57:33.000000000 -08002869 +++ vim72/src/gui_x11.c 2009-01-19 00:08:42.000000000 -0800 2630 2870 @@ -2450,7 +2450,7 @@ 2631 2871 *colorPtr = colortable[closest]; … … 2639 2879 diff -Naur vim72.orig/src/gui_xmdlg.c vim72/src/gui_xmdlg.c 2640 2880 --- vim72.orig/src/gui_xmdlg.c 2008-06-21 09:05:32.000000000 -0700 2641 +++ vim72/src/gui_xmdlg.c 2009-01- 08 20:57:44.000000000 -08002881 +++ vim72/src/gui_xmdlg.c 2009-01-19 00:09:39.000000000 -0800 2642 2882 @@ -369,10 +369,10 @@ 2643 2883 char buf[TEMP_BUF_SIZE]; … … 2795 3035 diff -Naur vim72.orig/src/gui_xmebw.c vim72/src/gui_xmebw.c 2796 3036 --- vim72.orig/src/gui_xmebw.c 2007-09-06 03:57:51.000000000 -0700 2797 +++ vim72/src/gui_xmebw.c 2009-01- 08 20:57:44.000000000 -08003037 +++ vim72/src/gui_xmebw.c 2009-01-19 00:09:39.000000000 -0800 2798 3038 @@ -1256,7 +1256,7 @@ 2799 3039 } … … 2822 3062 diff -Naur vim72.orig/src/if_cscope.c vim72/src/if_cscope.c 2823 3063 --- vim72.orig/src/if_cscope.c 2008-06-24 09:32:34.000000000 -0700 2824 +++ vim72/src/if_cscope.c 2009-01- 08 20:57:27.000000000 -08003064 +++ vim72/src/if_cscope.c 2009-01-19 00:07:11.000000000 -0800 2825 3065 @@ -74,7 +74,7 @@ 2826 3066 { "add", cs_add, … … 2852 3092 diff -Naur vim72.orig/src/if_cscope.h vim72/src/if_cscope.h 2853 3093 --- vim72.orig/src/if_cscope.h 2007-09-02 07:51:08.000000000 -0700 2854 +++ vim72/src/if_cscope.h 2009-01- 08 20:57:27.000000000 -08003094 +++ vim72/src/if_cscope.h 2009-01-19 00:07:11.000000000 -0800 2855 3095 @@ -42,17 +42,6 @@ 2856 3096 * f 7name Find this file … … 2873 3113 diff -Naur vim72.orig/src/if_perl.xs vim72/src/if_perl.xs 2874 3114 --- vim72.orig/src/if_perl.xs 2008-07-17 13:55:09.000000000 -0700 2875 +++ vim72/src/if_perl.xs 2009-01- 08 20:57:45.000000000 -08003115 +++ vim72/src/if_perl.xs 2009-01-19 00:10:02.000000000 -0800 2876 3116 @@ -136,6 +136,9 @@ 2877 3117 # define Perl_newXS_flags dll_Perl_newXS_flags … … 2924 3164 diff -Naur vim72.orig/src/if_python.c vim72/src/if_python.c 2925 3165 --- vim72.orig/src/if_python.c 2008-07-17 14:09:32.000000000 -0700 2926 +++ vim72/src/if_python.c 2009-01- 08 20:57:39.000000000 -08003166 +++ vim72/src/if_python.c 2009-01-19 00:10:59.000000000 -0800 2927 3167 @@ -531,6 +531,12 @@ 2928 3168 if (PythonMod_Init()) … … 2938 3178 Python_SaveThread(); 2939 3179 2940 @@ -2345,7 +2351,8 @@ 3180 @@ -1145,14 +1151,23 @@ 3181 3182 /* Check if we run into a recursive loop. The item must be in lookupDict 3183 * then and we can use it again. */ 3184 - sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv); 3185 - result = PyDict_GetItemString(lookupDict, ptrBuf); 3186 - if (result != NULL) 3187 - Py_INCREF(result); 3188 - else if (our_tv->v_type == VAR_STRING) 3189 + if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL) 3190 + || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL)) 3191 + { 3192 + sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, 3193 + our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list 3194 + : (long_u)our_tv->vval.v_dict); 3195 + result = PyDict_GetItemString(lookupDict, ptrBuf); 3196 + if (result != NULL) 3197 + { 3198 + Py_INCREF(result); 3199 + return result; 3200 + } 3201 + } 3202 + 3203 + if (our_tv->v_type == VAR_STRING) 3204 { 3205 result = Py_BuildValue("s", our_tv->vval.v_string); 3206 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3207 } 3208 else if (our_tv->v_type == VAR_NUMBER) 3209 { 3210 @@ -1161,7 +1176,6 @@ 3211 /* For backwards compatibility numbers are stored as strings. */ 3212 sprintf(buf, "%ld", (long)our_tv->vval.v_number); 3213 result = Py_BuildValue("s", buf); 3214 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3215 } 3216 # ifdef FEAT_FLOAT 3217 else if (our_tv->v_type == VAR_FLOAT) 3218 @@ -1170,7 +1184,6 @@ 3219 3220 sprintf(buf, "%f", our_tv->vval.v_float); 3221 result = Py_BuildValue("s", buf); 3222 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3223 } 3224 # endif 3225 else if (our_tv->v_type == VAR_LIST) 3226 @@ -1179,10 +1192,11 @@ 3227 listitem_T *curr; 3228 3229 result = PyList_New(0); 3230 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3231 3232 if (list != NULL) 3233 { 3234 + PyDict_SetItemString(lookupDict, ptrBuf, result); 3235 + 3236 for (curr = list->lv_first; curr != NULL; curr = curr->li_next) 3237 { 3238 newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict); 3239 @@ -1194,7 +1208,6 @@ 3240 else if (our_tv->v_type == VAR_DICT) 3241 { 3242 result = PyDict_New(); 3243 - PyDict_SetItemString(lookupDict, ptrBuf, result); 3244 3245 if (our_tv->vval.v_dict != NULL) 3246 { 3247 @@ -1203,6 +1216,8 @@ 3248 hashitem_T *hi; 3249 dictitem_T *di; 3250 3251 + PyDict_SetItemString(lookupDict, ptrBuf, result); 3252 + 3253 for (hi = ht->ht_array; todo > 0; ++hi) 3254 { 3255 if (!HASHITEM_EMPTY(hi)) 3256 @@ -2345,7 +2360,8 @@ 2941 3257 { 2942 3258 PyObject *mod; … … 2950 3266 diff -Naur vim72.orig/src/if_xcmdsrv.c vim72/src/if_xcmdsrv.c 2951 3267 --- vim72.orig/src/if_xcmdsrv.c 2008-07-18 06:05:03.000000000 -0700 2952 +++ vim72/src/if_xcmdsrv.c 2009-01- 08 20:57:36.000000000 -08003268 +++ vim72/src/if_xcmdsrv.c 2009-01-19 00:08:50.000000000 -0800 2953 3269 @@ -736,7 +736,7 @@ 2954 3270 + serverReply.ga_len; … … 2980 3296 diff -Naur vim72.orig/src/main.c vim72/src/main.c 2981 3297 --- vim72.orig/src/main.c 2008-07-24 01:40:56.000000000 -0700 2982 +++ vim72/src/main.c 2009-01- 08 20:57:44.000000000 -08003298 +++ vim72/src/main.c 2009-01-19 00:09:39.000000000 -0800 2983 3299 @@ -645,11 +645,12 @@ 2984 3300 … … 3042 3358 diff -Naur vim72.orig/src/mark.c vim72/src/mark.c 3043 3359 --- vim72.orig/src/mark.c 2008-08-08 15:06:49.000000000 -0700 3044 +++ vim72/src/mark.c 2009-01- 08 20:57:32.000000000 -08003360 +++ vim72/src/mark.c 2009-01-19 00:08:31.000000000 -0800 3045 3361 @@ -1627,15 +1627,17 @@ 3046 3362 … … 3111 3427 diff -Naur vim72.orig/src/mbyte.c vim72/src/mbyte.c 3112 3428 --- vim72.orig/src/mbyte.c 2008-07-14 05:38:05.000000000 -0700 3113 +++ vim72/src/mbyte.c 2009-01- 08 20:57:44.000000000 -08003429 +++ vim72/src/mbyte.c 2009-01-19 00:09:39.000000000 -0800 3114 3430 @@ -717,7 +717,7 @@ 3115 3431 * where mblen() returns 0 for invalid character. … … 3193 3509 diff -Naur vim72.orig/src/menu.c vim72/src/menu.c 3194 3510 --- vim72.orig/src/menu.c 2008-06-21 12:53:43.000000000 -0700 3195 +++ vim72/src/menu.c 2009-01- 08 20:57:27.000000000 -08003511 +++ vim72/src/menu.c 2009-01-19 00:07:05.000000000 -0800 3196 3512 @@ -1120,6 +1120,7 @@ 3197 3513 parent = menu; … … 3204 3520 diff -Naur vim72.orig/src/message.c vim72/src/message.c 3205 3521 --- vim72.orig/src/message.c 2008-07-09 11:24:55.000000000 -0700 3206 +++ vim72/src/message.c 2009-01-08 20:57:44.000000000 -0800 3207 @@ -4585,61 +4585,62 @@ 3522 +++ vim72/src/message.c 2009-01-19 00:10:51.000000000 -0800 3523 @@ -4556,7 +4556,13 @@ 3524 remove_trailing_zeroes = TRUE; 3525 } 3526 3527 - if (fmt_spec == 'f' && abs_f > 1.0e307) 3528 + if (fmt_spec == 'f' && 3529 +#ifdef VAX 3530 + abs_f > 1.0e38 3531 +#else 3532 + abs_f > 1.0e307 3533 +#endif 3534 + ) 3535 { 3536 /* Avoid a buffer overflow */ 3537 strcpy(tmp, "inf"); 3538 @@ -4585,61 +4591,62 @@ 3208 3539 if (remove_trailing_zeroes) 3209 3540 { … … 3291 3622 diff -Naur vim72.orig/src/misc1.c vim72/src/misc1.c 3292 3623 --- vim72.orig/src/misc1.c 2008-07-12 12:20:53.000000000 -0700 3293 +++ vim72/src/misc1.c 2009-01- 08 20:57:32.000000000 -08003624 +++ vim72/src/misc1.c 2009-01-19 00:08:31.000000000 -0800 3294 3625 @@ -3245,9 +3245,9 @@ 3295 3626 … … 3306 3637 diff -Naur vim72.orig/src/misc2.c vim72/src/misc2.c 3307 3638 --- vim72.orig/src/misc2.c 2008-07-23 12:12:56.000000000 -0700 3308 +++ vim72/src/misc2.c 2009-01- 08 20:57:52.000000000 -08003639 +++ vim72/src/misc2.c 2009-01-19 00:10:29.000000000 -0800 3309 3640 @@ -873,7 +873,7 @@ 3310 3641 /* 3. check for available memory: call mch_avail_mem() */ … … 3377 3708 diff -Naur vim72.orig/src/move.c vim72/src/move.c 3378 3709 --- vim72.orig/src/move.c 2008-07-12 09:26:47.000000000 -0700 3379 +++ vim72/src/move.c 2009-01- 08 20:57:39.000000000 -08003710 +++ vim72/src/move.c 2009-01-19 00:09:02.000000000 -0800 3380 3711 @@ -280,18 +280,20 @@ 3381 3712 … … 3427 3758 diff -Naur vim72.orig/src/netbeans.c vim72/src/netbeans.c 3428 3759 --- vim72.orig/src/netbeans.c 2008-07-13 09:19:54.000000000 -0700 3429 +++ vim72/src/netbeans.c 2009-01- 08 20:57:54.000000000 -08003760 +++ vim72/src/netbeans.c 2009-01-19 00:10:45.000000000 -0800 3430 3761 @@ -1043,7 +1043,7 @@ 3431 3762 nbdebug(("EVT: %s", buf)); … … 3516 3847 diff -Naur vim72.orig/src/normal.c vim72/src/normal.c 3517 3848 --- vim72.orig/src/normal.c 2008-07-31 13:03:08.000000000 -0700 3518 +++ vim72/src/normal.c 2009-01- 08 20:57:40.000000000 -08003849 +++ vim72/src/normal.c 2009-01-19 00:09:18.000000000 -0800 3519 3850 @@ -183,6 +183,8 @@ 3520 3851 static void nv_cursorhold __ARGS((cmdarg_T *cap)); … … 3704 4035 diff -Naur vim72.orig/src/ops.c vim72/src/ops.c 3705 4036 --- vim72.orig/src/ops.c 2008-06-21 13:08:59.000000000 -0700 3706 +++ vim72/src/ops.c 2009-01- 08 20:57:45.000000000 -08004037 +++ vim72/src/ops.c 2009-01-19 00:10:04.000000000 -0800 3707 4038 @@ -2209,12 +2209,15 @@ 3708 4039 { … … 3725 4056 diff -Naur vim72.orig/src/option.c vim72/src/option.c 3726 4057 --- vim72.orig/src/option.c 2008-07-18 06:05:33.000000000 -0700 3727 +++ vim72/src/option.c 2009-01- 08 20:57:52.000000000 -08004058 +++ vim72/src/option.c 2009-01-19 00:10:29.000000000 -0800 3728 4059 @@ -2593,13 +2593,13 @@ 3729 4060 #ifdef FEAT_VIMINFO … … 3783 4114 diff -Naur vim72.orig/src/os_unix.c vim72/src/os_unix.c 3784 4115 --- vim72.orig/src/os_unix.c 2008-08-06 04:01:40.000000000 -0700 3785 +++ vim72/src/os_unix.c 2009-01- 08 20:57:44.000000000 -08004116 +++ vim72/src/os_unix.c 2009-01-19 00:09:40.000000000 -0800 3786 4117 @@ -315,12 +315,15 @@ 3787 4118 {-1, "Unknown!", FALSE} … … 3897 4228 diff -Naur vim72.orig/src/proto/eval.pro vim72/src/proto/eval.pro 3898 4229 --- vim72.orig/src/proto/eval.pro 2008-08-09 07:31:25.000000000 -0700 3899 +++ vim72/src/proto/eval.pro 2009-01- 08 20:57:40.000000000 -08004230 +++ vim72/src/proto/eval.pro 2009-01-19 00:09:18.000000000 -0800 3900 4231 @@ -17,7 +17,7 @@ 3901 4232 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip)); … … 3939 4270 diff -Naur vim72.orig/src/proto/ex_cmds.pro vim72/src/proto/ex_cmds.pro 3940 4271 --- vim72.orig/src/proto/ex_cmds.pro 2008-08-09 07:31:25.000000000 -0700 3941 +++ vim72/src/proto/ex_cmds.pro 2009-01- 08 20:57:32.000000000 -08004272 +++ vim72/src/proto/ex_cmds.pro 2009-01-19 00:08:31.000000000 -0800 3942 4273 @@ -11,7 +11,7 @@ 3943 4274 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp)); … … 3951 4282 diff -Naur vim72.orig/src/proto/ex_getln.pro vim72/src/proto/ex_getln.pro 3952 4283 --- vim72.orig/src/proto/ex_getln.pro 2008-08-09 07:31:28.000000000 -0700 3953 +++ vim72/src/proto/ex_getln.pro 2009-01- 08 20:57:43.000000000 -08004284 +++ vim72/src/proto/ex_getln.pro 2009-01-19 00:09:28.000000000 -0800 3954 4285 @@ -31,7 +31,7 @@ 3955 4286 void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col)); … … 3963 4294 diff -Naur vim72.orig/src/proto/mark.pro vim72/src/proto/mark.pro 3964 4295 --- vim72.orig/src/proto/mark.pro 2008-08-09 07:31:36.000000000 -0700 3965 +++ vim72/src/proto/mark.pro 2009-01- 08 20:57:32.000000000 -08004296 +++ vim72/src/proto/mark.pro 2009-01-19 00:08:31.000000000 -0800 3966 4297 @@ -26,5 +26,5 @@ 3967 4298 void write_viminfo_filemarks __ARGS((FILE *fp)); … … 3973 4304 diff -Naur vim72.orig/src/proto/misc2.pro vim72/src/proto/misc2.pro 3974 4305 --- vim72.orig/src/proto/misc2.pro 2008-08-09 07:31:40.000000000 -0700 3975 +++ vim72/src/proto/misc2.pro 2009-01- 08 20:57:52.000000000 -08004306 +++ vim72/src/proto/misc2.pro 2009-01-19 00:10:29.000000000 -0800 3976 4307 @@ -59,7 +59,7 @@ 3977 4308 int handle_x_keys __ARGS((int key)); … … 3985 4316 diff -Naur vim72.orig/src/proto/netbeans.pro vim72/src/proto/netbeans.pro 3986 4317 --- vim72.orig/src/proto/netbeans.pro 2008-08-09 07:31:56.000000000 -0700 3987 +++ vim72/src/proto/netbeans.pro 2009-01- 08 20:57:54.000000000 -08004318 +++ vim72/src/proto/netbeans.pro 2009-01-19 00:10:45.000000000 -0800 3988 4319 @@ -11,7 +11,7 @@ 3989 4320 void netbeans_frame_moved __ARGS((int new_x, int new_y)); … … 3997 4328 diff -Naur vim72.orig/src/pty.c vim72/src/pty.c 3998 4329 --- vim72.orig/src/pty.c 2008-06-21 11:52:58.000000000 -0700 3999 +++ vim72/src/pty.c 2009-01- 08 20:57:27.000000000 -08004330 +++ vim72/src/pty.c 2009-01-19 00:07:02.000000000 -0800 4000 4331 @@ -270,9 +270,10 @@ 4001 4332 } … … 4013 4344 diff -Naur vim72.orig/src/screen.c vim72/src/screen.c 4014 4345 --- vim72.orig/src/screen.c 2008-07-24 07:45:07.000000000 -0700 4015 +++ vim72/src/screen.c 2009-01- 08 20:57:31.000000000 -08004346 +++ vim72/src/screen.c 2009-01-19 00:08:07.000000000 -0800 4016 4347 @@ -2439,9 +2439,17 @@ 4017 4348 … … 4037 4368 diff -Naur vim72.orig/src/spell.c vim72/src/spell.c 4038 4369 --- vim72.orig/src/spell.c 2008-07-12 12:20:55.000000000 -0700 4039 +++ vim72/src/spell.c 2009-01- 08 20:57:46.000000000 -08004370 +++ vim72/src/spell.c 2009-01-19 00:10:18.000000000 -0800 4040 4371 @@ -77,7 +77,7 @@ 4041 4372 … … 4872 5203 diff -Naur vim72.orig/src/structs.h vim72/src/structs.h 4873 5204 --- vim72.orig/src/structs.h 2008-07-30 13:02:50.000000000 -0700 4874 +++ vim72/src/structs.h 2009-01- 08 20:57:39.000000000 -08005205 +++ vim72/src/structs.h 2009-01-19 00:09:02.000000000 -0800 4875 5206 @@ -459,7 +459,7 @@ 4876 5207 typedef struct … … 4901 5232 diff -Naur vim72.orig/src/tag.c vim72/src/tag.c 4902 5233 --- vim72.orig/src/tag.c 2008-07-16 14:31:30.000000000 -0700 4903 +++ vim72/src/tag.c 2009-01-08 20:57:45.000000000 -0800 5234 +++ vim72/src/tag.c 2009-01-19 00:10:57.000000000 -0800 5235 @@ -515,7 +515,7 @@ 5236 * If a count is supplied to the ":tag <name>" command, then 5237 * jump to count'th matching tag. 5238 */ 5239 - if (type == DT_TAG && count > 0) 5240 + if (type == DT_TAG && *tag != NUL && count > 0) 5241 cur_match = count - 1; 5242 5243 if (type == DT_SELECT || type == DT_JUMP 4904 5244 @@ -2725,7 +2725,24 @@ 4905 5245 */ … … 4947 5287 diff -Naur vim72.orig/src/testdir/Make_ming.mak vim72/src/testdir/Make_ming.mak 4948 5288 --- vim72.orig/src/testdir/Make_ming.mak 1969-12-31 16:00:00.000000000 -0800 4949 +++ vim72/src/testdir/Make_ming.mak 2009-01- 08 20:57:31.000000000 -08005289 +++ vim72/src/testdir/Make_ming.mak 2009-01-19 00:08:05.000000000 -0800 4950 5290 @@ -0,0 +1,91 @@ 4951 5291 +# Makefile to run tests for Vim, on Dos-like machines … … 5042 5382 diff -Naur vim72.orig/src/testdir/Makefile vim72/src/testdir/Makefile 5043 5383 --- vim72.orig/src/testdir/Makefile 2008-06-19 13:29:46.000000000 -0700 5044 +++ vim72/src/testdir/Makefile 2009-01- 08 20:57:31.000000000 -08005384 +++ vim72/src/testdir/Makefile 2009-01-19 00:07:44.000000000 -0800 5045 5385 @@ -26,15 +26,17 @@ 5046 5386 … … 5076 5416 diff -Naur vim72.orig/src/testdir/test42.ok vim72/src/testdir/test42.ok 5077 5417 --- vim72.orig/src/testdir/test42.ok 2008-02-20 04:27:37.000000000 -0800 5078 +++ vim72/src/testdir/test42.ok 2009-01- 08 20:57:32.000000000 -08005418 +++ vim72/src/testdir/test42.ok 2009-01-19 00:08:36.000000000 -0800 5079 5419 @@ -20,7 +20,7 @@ 5080 5420 ucs-2 … … 5088 5428 diff -Naur vim72.orig/src/ui.c vim72/src/ui.c 5089 5429 --- vim72.orig/src/ui.c 2008-07-14 11:14:56.000000000 -0700 5090 +++ vim72/src/ui.c 2009-01- 08 20:57:44.000000000 -08005430 +++ vim72/src/ui.c 2009-01-19 00:09:40.000000000 -0800 5091 5431 @@ -1820,7 +1820,7 @@ 5092 5432 #ifdef HAVE_DUP … … 5196 5536 diff -Naur vim72.orig/src/version.c vim72/src/version.c 5197 5537 --- vim72.orig/src/version.c 2008-08-09 07:24:52.000000000 -0700 5198 +++ vim72/src/version.c 2009-01- 08 20:57:54.000000000 -08005199 @@ -677,9 +677,1 66 @@5538 +++ vim72/src/version.c 2009-01-19 00:10:59.000000000 -0800 5539 @@ -677,9 +677,176 @@ 5200 5540 static int included_patches[] = 5201 5541 { /* Add new patch number below this line */ 5202 5542 /**/ 5543 + 84, 5544 +/**/ 5545 + 83, 5546 +/**/ 5547 + 82, 5548 +/**/ 5549 + 81, 5550 +/**/ 5551 + 80, 5552 +/**/ 5203 5553 + 79, 5204 5554 +/**/ … … 5364 5714 highest_patch() 5365 5715 { 5366 @@ -786,7 +9 43,7 @@5716 @@ -786,7 +953,7 @@ 5367 5717 MSG_PUTS(_("\nRISC OS version")); 5368 5718 #endif … … 5373 5723 if (*compiled_arch != NUL) 5374 5724 { 5375 @@ -825,6 +9 82,19 @@5725 @@ -825,6 +992,19 @@ 5376 5726 } 5377 5727 } … … 5395 5745 diff -Naur vim72.orig/src/vim.h vim72/src/vim.h 5396 5746 --- vim72.orig/src/vim.h 2008-08-09 09:03:38.000000000 -0700 5397 +++ vim72/src/vim.h 2009-01- 08 20:57:39.000000000 -08005747 +++ vim72/src/vim.h 2009-01-19 00:09:15.000000000 -0800 5398 5748 @@ -341,8 +341,14 @@ 5399 5749 #ifdef BACKSLASH_IN_FILENAME … … 5455 5805 diff -Naur vim72.orig/src/window.c vim72/src/window.c 5456 5806 --- vim72.orig/src/window.c 2008-08-06 04:00:30.000000000 -0700 5457 +++ vim72/src/window.c 2009-01- 08 20:57:44.000000000 -08005807 +++ vim72/src/window.c 2009-01-19 00:09:40.000000000 -0800 5458 5808 @@ -4028,14 +4028,14 @@ 5459 5809 if (mch_dirname(cwd, MAXPATHL) == OK) … … 5476 5826 diff -Naur vim72.orig/src/workshop.c vim72/src/workshop.c 5477 5827 --- vim72.orig/src/workshop.c 2008-06-21 11:53:26.000000000 -0700 5478 +++ vim72/src/workshop.c 2009-01- 08 20:57:43.000000000 -08005828 +++ vim72/src/workshop.c 2009-01-19 00:09:33.000000000 -0800 5479 5829 @@ -1121,8 +1121,12 @@ 5480 5830 ? (char *)curbuf->b_sfname : "<None>");
Note:
See TracChangeset
for help on using the changeset viewer.