Mirror of the Vim source from https://github.com/vim/vim
リビジョン | f08390485cd365abce88ade8987e56bd267cf3e4 (tree) |
---|---|
日時 | 2006-03-01 09:01:28 |
作者 | vimboss |
コミッター | vimboss |
updated for version 7.0210
@@ -1,4 +1,4 @@ | ||
1 | -*eval.txt* For Vim version 7.0aa. Last change: 2006 Feb 27 | |
1 | +*eval.txt* For Vim version 7.0aa. Last change: 2006 Feb 28 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -3375,11 +3375,11 @@ | ||
3375 | 3375 | {start} bytes later, thus "^" will match there. |
3376 | 3376 | For a String, if {start} < 0, it will be set to 0. For a list |
3377 | 3377 | the index is counted from the end. |
3378 | - If {start} is out of range (> strlen({expr} for a String or | |
3379 | - > len({expr} for a |List|) -1 is returned. | |
3378 | + If {start} is out of range ({start} > strlen({expr}) for a | |
3379 | + String or {start} > len({expr}) for a |List|) -1 is returned. | |
3380 | 3380 | |
3381 | 3381 | When {count} is given use the {count}'th match. When a match |
3382 | - is found in a String the search for the next one starts on | |
3382 | + is found in a String the search for the next one starts one | |
3383 | 3383 | character further. Thus this example results in 1: > |
3384 | 3384 | echo match("testing", "..", 0, 2) |
3385 | 3385 | < In a |List| the search continues in the next item. |
@@ -1,4 +1,4 @@ | ||
1 | -*options.txt* For Vim version 7.0aa. Last change: 2006 Feb 27 | |
1 | +*options.txt* For Vim version 7.0aa. Last change: 2006 Feb 28 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -3252,7 +3252,7 @@ | ||
3252 | 3252 | 'c' Use console dialogs instead of popup dialogs for simple |
3253 | 3253 | choices. |
3254 | 3254 | |
3255 | - 'e' Add tab pages when indicated with 'showtabpages'. | |
3255 | + 'e' Add tab pages when indicated with 'showtabline'. | |
3256 | 3256 | 'guitablabel' can be used to change the text in the labels. |
3257 | 3257 | When 'e' is missing a non-GUI tab pages line may be used. |
3258 | 3258 |
@@ -2710,6 +2710,8 @@ | ||
2710 | 2710 | :una map.txt /*:una* |
2711 | 2711 | :unabbreviate map.txt /*:unabbreviate* |
2712 | 2712 | :undo undo.txt /*:undo* |
2713 | +:undoj undo.txt /*:undoj* | |
2714 | +:undojoin undo.txt /*:undojoin* | |
2713 | 2715 | :unh windows.txt /*:unh* |
2714 | 2716 | :unhide windows.txt /*:unhide* |
2715 | 2717 | :unl eval.txt /*:unl* |
@@ -5471,6 +5473,7 @@ | ||
5471 | 5473 | hebrew.txt hebrew.txt /*hebrew.txt* |
5472 | 5474 | help various.txt /*help* |
5473 | 5475 | help-context help.txt /*help-context* |
5476 | +help-tags tags 1 | |
5474 | 5477 | help-translated various.txt /*help-translated* |
5475 | 5478 | help-xterm-window various.txt /*help-xterm-window* |
5476 | 5479 | help.txt help.txt /*help.txt* |
@@ -7132,6 +7135,7 @@ | ||
7132 | 7135 | undercurl syntax.txt /*undercurl* |
7133 | 7136 | underline syntax.txt /*underline* |
7134 | 7137 | undo undo.txt /*undo* |
7138 | +undo-blocks undo.txt /*undo-blocks* | |
7135 | 7139 | undo-commands undo.txt /*undo-commands* |
7136 | 7140 | undo-redo undo.txt /*undo-redo* |
7137 | 7141 | undo-remarks undo.txt /*undo-remarks* |
@@ -1,4 +1,4 @@ | ||
1 | -*todo.txt* For Vim version 7.0aa. Last change: 2006 Feb 27 | |
1 | +*todo.txt* For Vim version 7.0aa. Last change: 2006 Feb 28 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -30,19 +30,15 @@ | ||
30 | 30 | *known-bugs* |
31 | 31 | -------------------- Known bugs and current work ----------------------- |
32 | 32 | |
33 | -test 49 fails because of the function line numbering now taking care of | |
34 | -continuation lines. | |
33 | +Gcc 4 gives more warnings for uninitialized vars. | |
34 | + | |
35 | +Ignore "j" at hit-enter prompt? "k" already works differently. | |
35 | 36 | |
36 | 37 | Crash with X command server (Ciaran McCreesh). |
37 | 38 | |
38 | 39 | Ctags still hasn't included the patch. Darren is looking for someone to do |
39 | 40 | maintanance. |
40 | 41 | |
41 | -"fsutil hardlink" can create a hard link on an NTFS file system. (Daniel | |
42 | -Einspanjer) What library function can detect that? | |
43 | -Win32: use GetFileInformationByHandle() to detect hard links on NTFS? | |
44 | -(George Reilly) | |
45 | - | |
46 | 42 | spelling: |
47 | 43 | - Also use the spelling dictionary for dictionary completion. |
48 | 44 | When 'dictionary' is empty and/or when "kspell" is in 'complete'. |
@@ -89,9 +85,6 @@ | ||
89 | 85 | Is it possible to keep the command-line window open? Would actually work like |
90 | 86 | closing it, executing the command and re-opening it (at the same position). |
91 | 87 | |
92 | -":keepundo": add change to existing undo chain, so that one "u" undoes them | |
93 | -all. (Gautam Iyer) | |
94 | - | |
95 | 88 | Mac unicode patch (Da Woon Jung): |
96 | 89 | - configuration option for platform: i386, ppc or both. |
97 | 90 | Use __LITTLE_ENDIAN__ to test for current platform. |
@@ -249,7 +242,7 @@ | ||
249 | 242 | to avoid a performance penalty (esp. for string options)? |
250 | 243 | 8 Support four composing/combining characters, needed for Hebrew. (Ron Aaron) |
251 | 244 | Add the 'maxcombining' option to set the nr. of composing characters. |
252 | - At the same time support more colors (use two bytes when necessary). | |
245 | + At the same time support 32 bit Unicode characters? | |
253 | 246 | 8 "ga" should show all composing characters, also if there are more than 2. |
254 | 247 | 8 Searching for a composing character by itself should work. Perhaps "." |
255 | 248 | with a composing char should work too. |
@@ -1,4 +1,4 @@ | ||
1 | -*undo.txt* For Vim version 7.0aa. Last change: 2003 Oct 21 | |
1 | +*undo.txt* For Vim version 7.0aa. Last change: 2006 Feb 28 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -10,7 +10,8 @@ | ||
10 | 10 | |
11 | 11 | 1. Undo and redo commands |undo-commands| |
12 | 12 | 2. Two ways of undo |undo-two-ways| |
13 | -3. Remarks about undo |undo-remarks| | |
13 | +3. Undo blocks |undo-blocks| | |
14 | +4. Remarks about undo |undo-remarks| | |
14 | 15 | |
15 | 16 | ============================================================================== |
16 | 17 | 1. Undo and redo commands *undo-commands* |
@@ -72,7 +73,36 @@ | ||
72 | 73 | words, in Nvi it does nothing. |
73 | 74 | |
74 | 75 | ============================================================================== |
75 | -3. Remarks about undo *undo-remarks* | |
76 | +3. Undo blocks *undo-blocks* | |
77 | + | |
78 | +One undo command normally undoes a typed command, no matter how many changes | |
79 | +that command makes. This sequence of undo-able changes forms an undo block. | |
80 | +Thus if the typed key(s) call a function, all the commands in the function are | |
81 | +undone together. | |
82 | + | |
83 | +If you want to write a function or script that doesn't create a new undoable | |
84 | +change but joins in with the previous change use this command: | |
85 | + | |
86 | + *:undoj* *:undojoin* | |
87 | +:undoj[oin] Join further changes with the previous undo block. | |
88 | + Warning: Use with care, it may prevent the user from | |
89 | + properly undoing changes. | |
90 | + {not in Vi} | |
91 | + | |
92 | +This is most useful when you need to prompt the user halfway a change. For | |
93 | +example in a function that calls |getchar()|. Do make sure that there was a | |
94 | +related change before this that you must join with. | |
95 | + | |
96 | +This doesn't work by itself, because the next key press will start a new | |
97 | +change again. But you can do something like this: > | |
98 | + | |
99 | + :undojoin | delete | |
100 | + | |
101 | +After this an "u" command will undo the delete command and the previous | |
102 | +change. | |
103 | + | |
104 | +============================================================================== | |
105 | +4. Remarks about undo *undo-remarks* | |
76 | 106 | |
77 | 107 | The number of changes that are remembered is set with the 'undolevels' option. |
78 | 108 | If it is zero, the Vi-compatible way is always used. If it is negative no |
@@ -1,4 +1,4 @@ | ||
1 | -*usr_31.txt* For Vim version 7.0aa. Last change: 2003 Oct 21 | |
1 | +*usr_31.txt* For Vim version 7.0aa. Last change: 2006 Feb 28 | |
2 | 2 | |
3 | 3 | VIM USER MANUAL - by Bram Moolenaar |
4 | 4 |
@@ -76,7 +76,7 @@ | ||
76 | 76 | |
77 | 77 | When you are not using the GUI version, you could use the file explorer window |
78 | 78 | to select files like in a file browser. However, this doesn't work for the |
79 | -":browse" command. See |file-explorer|. | |
79 | +":browse" command. See |netrw-browse|. | |
80 | 80 | |
81 | 81 | ============================================================================== |
82 | 82 | *31.2* Confirmation |
@@ -1,4 +1,4 @@ | ||
1 | -*version7.txt* For Vim version 7.0aa. Last change: 2006 Feb 27 | |
1 | +*version7.txt* For Vim version 7.0aa. Last change: 2006 Feb 28 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -132,6 +132,12 @@ | ||
132 | 132 | that could be the function argument without type. Now it finds the position |
133 | 133 | where the type is given. |
134 | 134 | |
135 | +The line continuation in functions was not taken into account, line numbers in | |
136 | +errors were logical lines, not lines in the sourced file. That made it | |
137 | +difficult to locate errors. Now the line number in the sourced file is | |
138 | +reported, relative to the function start. This also means that line numbers | |
139 | +for ":breakadd func" are different. | |
140 | + | |
135 | 141 | ============================================================================== |
136 | 142 | NEW FEATURES *new-7* |
137 | 143 |
@@ -510,6 +516,8 @@ | ||
510 | 516 | |:lcscope| Like |:cscope| but use the location list. |
511 | 517 | |:ltag| Jump to a tag and add matching tags to a location list. |
512 | 518 | |
519 | +|:undojoin| Join a change with the previous undo block. | |
520 | + | |
513 | 521 | |
514 | 522 | Ex command modifiers: ~ |
515 | 523 |
@@ -836,6 +844,10 @@ | ||
836 | 844 | Win32: When libintl.dll supports bind_textdomain_codeset(), use it. |
837 | 845 | (NAKADAIRA Yukihiro) |
838 | 846 | |
847 | +Win32: Vim was not aware of hard links on NTFS file systems. These are | |
848 | +detected now for when 'backupcopy' is "auto". Also fixed a bogus "file has | |
849 | +been changed since reading it" error for links. | |
850 | + | |
839 | 851 | When foldtext() finds no text after removing the comment leader, use the |
840 | 852 | second line of the fold. Helps for C-style /* */ comments where the first |
841 | 853 | line is just "/*". |
@@ -1787,8 +1799,8 @@ | ||
1787 | 1799 | the same way as "Replace". Escape backslashes so that they are taken |
1788 | 1800 | literally. |
1789 | 1801 | |
1790 | -An error in a function reported a line number that doesn't take line | |
1791 | -continuation into account. Now store a NULL for continuation lines, so that | |
1792 | -the index is equal to the line number in the sourced file. | |
1802 | +When using Select mode from Insert mode and typing a key, causing lines to be | |
1803 | +deleted and a message displayed, delayed the effect of inserting the key. | |
1804 | +Now overwrite the message without delay. | |
1793 | 1805 | |
1794 | 1806 | vim:tw=78:ts=8:ft=help:norl: |
@@ -1270,6 +1270,10 @@ | ||
1270 | 1270 | |
1271 | 1271 | ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS) |
1272 | 1272 | |
1273 | +# Exclude $CFLAGS for osdef.sh, for Mac 10.4 some flags don't work together | |
1274 | +# with "-E". | |
1275 | +OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS) | |
1276 | + | |
1273 | 1277 | LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) -Dinline= -D__extension__= -Dalloca=alloca |
1274 | 1278 | |
1275 | 1279 | LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)=" |
@@ -2219,7 +2223,7 @@ | ||
2219 | 2223 | $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ |
2220 | 2224 | |
2221 | 2225 | auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in |
2222 | - CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh | |
2226 | + CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh | |
2223 | 2227 | |
2224 | 2228 | QUOTESED = sed -e 's/"/\\"/g' -e 's/\\"/"/' -e 's/\\";$$/";/' |
2225 | 2229 | auto/pathdef.c: Makefile auto/config.mk |
@@ -2783,7 +2783,7 @@ | ||
2783 | 2783 | if test "$GCC" = yes; then |
2784 | 2784 | gccversion=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\(darwin.[^0-9]*\)*\([0-9]\.[0-9.]*\).*$/\2/g'` |
2785 | 2785 | if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then |
2786 | - echo 'GCC 34.0.12 has a bug in the optimizer, disabling "-O#"' | |
2786 | + echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"' | |
2787 | 2787 | CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'` |
2788 | 2788 | else |
2789 | 2789 | if test "$gccversion" = "3.1" -o "$gccversion" = "3.2" -o "$gccversion" = "3.2.1" && `echo "$CFLAGS" | grep -v fno-strength-reduce >/dev/null`; then |
@@ -2874,17 +2874,17 @@ | ||
2874 | 2874 | MACARCH="$withval"; echo "$as_me:$LINENO: result: $MACARCH" >&5 |
2875 | 2875 | echo "${ECHO_T}$MACARCH" >&6 |
2876 | 2876 | else |
2877 | - MACARCH="both"; echo "$as_me:$LINENO: result: Defaulting to $MACARCH" >&5 | |
2878 | -echo "${ECHO_T}Defaulting to $MACARCH" >&6 | |
2877 | + MACARCH="both"; echo "$as_me:$LINENO: result: defaulting to $MACARCH" >&5 | |
2878 | +echo "${ECHO_T}defaulting to $MACARCH" >&6 | |
2879 | 2879 | fi; |
2880 | 2880 | |
2881 | 2881 | if test "x$MACARCH" = "xboth"; then |
2882 | - echo "$as_me:$LINENO: checking if both architectures are supported" >&5 | |
2883 | -echo $ECHO_N "checking if both architectures are supported... $ECHO_C" >&6 | |
2884 | - save_cppflags="$CPPFLAGS" | |
2882 | + echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5 | |
2883 | +echo $ECHO_N "checking for 10.4 universal SDK... $ECHO_C" >&6 | |
2884 | + save_cppflags="$CPPFLAGS" | |
2885 | + save_cflags="$CFLAGS" | |
2885 | 2886 | save_ldflags="$LDFLAGS" |
2886 | - CPPFLAGS="$CPPFLAGS -arch i386 -arch ppc" | |
2887 | - LDFLAGS="$LDFLAGS -arch i386 -arch ppc" | |
2887 | + CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" | |
2888 | 2888 | cat >conftest.$ac_ext <<_ACEOF |
2889 | 2889 | /* confdefs.h. */ |
2890 | 2890 | _ACEOF |
@@ -2922,19 +2922,20 @@ | ||
2922 | 2922 | ac_status=$? |
2923 | 2923 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2924 | 2924 | (exit $ac_status); }; }; then |
2925 | - echo "$as_me:$LINENO: result: yes" >&5 | |
2926 | -echo "${ECHO_T}yes" >&6 | |
2927 | -else | |
2928 | - echo "$as_me: failed program was:" >&5 | |
2929 | -sed 's/^/| /' conftest.$ac_ext >&5 | |
2930 | - | |
2931 | -echo "$as_me:$LINENO: result: no" >&5 | |
2932 | -echo "${ECHO_T}no" >&6 | |
2933 | - echo "$as_me:$LINENO: checking if Intel architecture is supported" >&5 | |
2925 | + echo "$as_me:$LINENO: result: found" >&5 | |
2926 | +echo "${ECHO_T}found" >&6 | |
2927 | +else | |
2928 | + echo "$as_me: failed program was:" >&5 | |
2929 | +sed 's/^/| /' conftest.$ac_ext >&5 | |
2930 | + | |
2931 | +echo "$as_me:$LINENO: result: not found" >&5 | |
2932 | +echo "${ECHO_T}not found" >&6 | |
2933 | + CFLAGS="save_cflags" | |
2934 | + echo "$as_me:$LINENO: checking if Intel architecture is supported" >&5 | |
2934 | 2935 | echo $ECHO_N "checking if Intel architecture is supported... $ECHO_C" >&6 |
2935 | - CPPFLAGS="$save_cppflags -arch i386" | |
2936 | - LDFLAGS="$save_ldflags -arch i386" | |
2937 | - cat >conftest.$ac_ext <<_ACEOF | |
2936 | + CPPFLAGS="$CPPFLAGS -arch i386" | |
2937 | + LDFLAGS="$save_ldflags -arch i386" | |
2938 | + cat >conftest.$ac_ext <<_ACEOF | |
2938 | 2939 | /* confdefs.h. */ |
2939 | 2940 | _ACEOF |
2940 | 2941 | cat confdefs.h >>conftest.$ac_ext |
@@ -2978,36 +2979,34 @@ | ||
2978 | 2979 | sed 's/^/| /' conftest.$ac_ext >&5 |
2979 | 2980 | |
2980 | 2981 | echo "$as_me:$LINENO: result: no" >&5 |
2981 | -echo "${ECHO_T}no" >&6; MACARCH="ppc" | |
2982 | -fi | |
2983 | -rm -f conftest.err conftest.$ac_objext \ | |
2984 | - conftest$ac_exeext conftest.$ac_ext | |
2985 | -fi | |
2986 | -rm -f conftest.err conftest.$ac_objext \ | |
2987 | - conftest$ac_exeext conftest.$ac_ext | |
2988 | - CPPFLAGS="$save_cppflags" | |
2989 | - LDFLAGS="$save_ldflags" | |
2990 | - fi | |
2991 | - | |
2992 | - case "$MACARCH" in | |
2993 | - intel) MAC_OSX_ARCH="-arch i386";; | |
2994 | - both) MAC_OSX_ARCH="-arch i386 -arch ppc";; | |
2995 | - ppc) MAC_OSX_ARCH="-arch ppc";; | |
2996 | - *) MAC_OSX_ARCH="";; | |
2997 | - esac | |
2998 | - | |
2999 | - if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then | |
3000 | - CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'` | |
3001 | - fi | |
3002 | - | |
3003 | - CPPFLAGS="$CPPFLAGS $MAC_OSX_ARCH" | |
3004 | - LDFLAGS="$LDFLAGS $MAC_OSX_ARCH" | |
2982 | +echo "${ECHO_T}no" >&6 | |
2983 | + MACARCH="ppc" | |
2984 | + CPPFLAGS="$save_cppflags -arch ppc" | |
2985 | + LDFLAGS="$save_ldflags -arch ppc" | |
2986 | +fi | |
2987 | +rm -f conftest.err conftest.$ac_objext \ | |
2988 | + conftest$ac_exeext conftest.$ac_ext | |
2989 | +fi | |
2990 | +rm -f conftest.err conftest.$ac_objext \ | |
2991 | + conftest$ac_exeext conftest.$ac_ext | |
2992 | + elif test "x$MACARCH" = "xintel"; then | |
2993 | + CPPFLAGS="$CPPFLAGS -arch intel" | |
2994 | + LDFLAGS="$LDFLAGS -arch intel" | |
2995 | + else | |
2996 | + CPPFLAGS="$CPPFLAGS -arch ppc" | |
2997 | + LDFLAGS="$LDFLAGS -arch ppc" | |
2998 | + fi | |
3005 | 2999 | |
3006 | 3000 | if test "$enable_darwin" = "yes"; then |
3007 | 3001 | MACOSX=yes |
3008 | 3002 | OS_EXTRA_SCR="os_macosx.c os_mac_conv.c"; |
3009 | 3003 | OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" |
3010 | - CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp" | |
3004 | + CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp" | |
3005 | + if test "x$MACARCH" = "xboth"; then | |
3006 | + CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon" | |
3007 | + else | |
3008 | + CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon" | |
3009 | + fi | |
3011 | 3010 | |
3012 | 3011 | echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
3013 | 3012 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 |
@@ -3396,6 +3395,13 @@ | ||
3396 | 3395 | fi |
3397 | 3396 | fi |
3398 | 3397 | |
3398 | + if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then | |
3399 | + CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-Oz/'` | |
3400 | + fi | |
3401 | + | |
3402 | + CPPFLAGS="$CPPFLAGS $MAC_OSX_ARCH" | |
3403 | + LDFLAGS="$LDFLAGS $MAC_OSX_ARCH" | |
3404 | + | |
3399 | 3405 | else |
3400 | 3406 | echo "$as_me:$LINENO: result: no" >&5 |
3401 | 3407 | echo "${ECHO_T}no" >&6 |
@@ -15222,6 +15228,9 @@ | ||
15222 | 15228 | echo "${ECHO_T}no" >&6 |
15223 | 15229 | fi |
15224 | 15230 | fi |
15231 | +if test "x$MACARCH" = "xboth"; then | |
15232 | + LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" | |
15233 | +fi | |
15225 | 15234 | |
15226 | 15235 | echo "$as_me:$LINENO: checking for GCC 3 or later" >&5 |
15227 | 15236 | echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6 |
@@ -32,7 +32,7 @@ | ||
32 | 32 | gccversion=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\(darwin.[[^0-9]]*\)*\([[0-9]]\.[[0-9.]]*\).*$/\2/g'` |
33 | 33 | dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki |
34 | 34 | if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then |
35 | - echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"' | |
35 | + echo 'GCC [[34]].0.[[12]] has a bug in the optimizer, disabling "-O#"' | |
36 | 36 | CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-O/'` |
37 | 37 | else |
38 | 38 | if test "$gccversion" = "3.1" -o "$gccversion" = "3.2" -o "$gccversion" = "3.2.1" && `echo "$CFLAGS" | grep -v fno-strength-reduce >/dev/null`; then |
@@ -105,48 +105,53 @@ | ||
105 | 105 | AC_MSG_CHECKING(--with-mac-arch argument) |
106 | 106 | AC_ARG_WITH(mac-arch, [ --with-mac-arch=ARCH intel, ppc or both], |
107 | 107 | MACARCH="$withval"; AC_MSG_RESULT($MACARCH), |
108 | - MACARCH="both"; AC_MSG_RESULT(Defaulting to $MACARCH)) | |
108 | + MACARCH="both"; AC_MSG_RESULT(defaulting to $MACARCH)) | |
109 | 109 | |
110 | 110 | if test "x$MACARCH" = "xboth"; then |
111 | - AC_MSG_CHECKING(if both architectures are supported) | |
111 | + AC_MSG_CHECKING(for 10.4 universal SDK) | |
112 | + dnl There is a terrible inconsistency (but we appear to get away with it): | |
113 | + dnl $CFLAGS uses the 10.4u SDK library for the headers, while $CPPFLAGS | |
114 | + dnl doesn't, because "gcc -E" doesn't grok it. That means the configure | |
115 | + dnl tests using the preprocessor are actually done with the wrong header | |
116 | + dnl files. $LDFLAGS is set at the end, because configure uses it together | |
117 | + dnl with $CFLAGS and we can only have one -sysroot argument. | |
112 | 118 | save_cppflags="$CPPFLAGS" |
119 | + save_cflags="$CFLAGS" | |
113 | 120 | save_ldflags="$LDFLAGS" |
114 | - CPPFLAGS="$CPPFLAGS -arch i386 -arch ppc" | |
115 | - LDFLAGS="$LDFLAGS -arch i386 -arch ppc" | |
121 | + CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" | |
116 | 122 | AC_TRY_LINK([ ], [ ], |
117 | - AC_MSG_RESULT(yes), | |
118 | - AC_MSG_RESULT(no) | |
119 | - AC_MSG_CHECKING(if Intel architecture is supported) | |
120 | - CPPFLAGS="$save_cppflags -arch i386" | |
121 | - LDFLAGS="$save_ldflags -arch i386" | |
122 | - AC_TRY_LINK([ ], [ ], | |
123 | - AC_MSG_RESULT(yes); MACARCH="intel", | |
124 | - AC_MSG_RESULT(no); MACARCH="ppc")) | |
125 | - CPPFLAGS="$save_cppflags" | |
126 | - LDFLAGS="$save_ldflags" | |
127 | - fi | |
123 | + AC_MSG_RESULT(found, will make universal binary), | |
128 | 124 | |
129 | - case "$MACARCH" in | |
130 | - intel) MAC_OSX_ARCH="-arch i386";; | |
131 | - both) MAC_OSX_ARCH="-arch i386 -arch ppc";; | |
132 | - ppc) MAC_OSX_ARCH="-arch ppc";; | |
133 | - *) MAC_OSX_ARCH="";; | |
134 | - esac | |
135 | - | |
136 | - dnl avoid a bug with -O2 for intel | |
137 | - if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then | |
138 | - CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-O/'` | |
125 | + AC_MSG_RESULT(not found) | |
126 | + CFLAGS="save_cflags" | |
127 | + AC_MSG_CHECKING(if Intel architecture is supported) | |
128 | + CPPFLAGS="$CPPFLAGS -arch i386" | |
129 | + LDFLAGS="$save_ldflags -arch i386" | |
130 | + AC_TRY_LINK([ ], [ ], | |
131 | + AC_MSG_RESULT(yes); MACARCH="intel", | |
132 | + AC_MSG_RESULT(no, using PowerPC) | |
133 | + MACARCH="ppc" | |
134 | + CPPFLAGS="$save_cppflags -arch ppc" | |
135 | + LDFLAGS="$save_ldflags -arch ppc")) | |
136 | + elif test "x$MACARCH" = "xintel"; then | |
137 | + CPPFLAGS="$CPPFLAGS -arch intel" | |
138 | + LDFLAGS="$LDFLAGS -arch intel" | |
139 | + else | |
140 | + CPPFLAGS="$CPPFLAGS -arch ppc" | |
141 | + LDFLAGS="$LDFLAGS -arch ppc" | |
139 | 142 | fi |
140 | 143 | |
141 | - CPPFLAGS="$CPPFLAGS $MAC_OSX_ARCH" | |
142 | - LDFLAGS="$LDFLAGS $MAC_OSX_ARCH" | |
143 | - | |
144 | 144 | if test "$enable_darwin" = "yes"; then |
145 | 145 | MACOSX=yes |
146 | 146 | OS_EXTRA_SCR="os_macosx.c os_mac_conv.c"; |
147 | 147 | OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" |
148 | 148 | dnl TODO: use -arch i386 on Intel machines |
149 | - CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp" | |
149 | + CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp" | |
150 | + if test "x$MACARCH" = "xboth"; then | |
151 | + CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon" | |
152 | + else | |
153 | + CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon" | |
154 | + fi | |
150 | 155 | |
151 | 156 | dnl If Carbon is found, assume we don't want X11 |
152 | 157 | dnl unless it was specifically asked for (--with-x) |
@@ -159,6 +164,14 @@ | ||
159 | 164 | fi |
160 | 165 | fi |
161 | 166 | |
167 | + dnl avoid a bug with -O2 for intel | |
168 | + if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then | |
169 | + CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-Oz/'` | |
170 | + fi | |
171 | + | |
172 | + CPPFLAGS="$CPPFLAGS $MAC_OSX_ARCH" | |
173 | + LDFLAGS="$LDFLAGS $MAC_OSX_ARCH" | |
174 | + | |
162 | 175 | else |
163 | 176 | AC_MSG_RESULT(no) |
164 | 177 | fi |
@@ -2794,6 +2807,9 @@ | ||
2794 | 2807 | AC_MSG_RESULT(no) |
2795 | 2808 | fi |
2796 | 2809 | fi |
2810 | +if test "x$MACARCH" = "xboth"; then | |
2811 | + LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" | |
2812 | +fi | |
2797 | 2813 | |
2798 | 2814 | dnl gcc 3.1 changed the meaning of -MM. The only solution appears to be to |
2799 | 2815 | dnl use "-isystem" instead of "-I" for all non-Vim include dirs. |
@@ -3253,14 +3253,13 @@ | ||
3253 | 3253 | /* Go through the List with matches and add each of them. */ |
3254 | 3254 | for (li = matchlist->lv_first; li != NULL; li = li->li_next) |
3255 | 3255 | { |
3256 | + icase = p_ic; | |
3256 | 3257 | if (li->li_tv.v_type == VAR_DICT && li->li_tv.vval.v_dict != NULL) |
3257 | 3258 | { |
3258 | 3259 | p = get_dict_string(li->li_tv.vval.v_dict, (char_u *)"word", FALSE); |
3259 | 3260 | x = get_dict_string(li->li_tv.vval.v_dict, (char_u *)"menu", FALSE); |
3260 | 3261 | if (get_dict_string(li->li_tv.vval.v_dict, (char_u *)"icase", |
3261 | - FALSE) == NULL) | |
3262 | - icase = p_ic; | |
3263 | - else | |
3262 | + FALSE) != NULL) | |
3264 | 3263 | icase = get_dict_number(li->li_tv.vval.v_dict, |
3265 | 3264 | (char_u *)"icase"); |
3266 | 3265 | } |
@@ -15612,7 +15612,7 @@ | ||
15612 | 15612 | pos.col = get_tv_number(&li->li_tv); |
15613 | 15613 | len = (long)STRLEN(ml_get(pos.lnum)); |
15614 | 15614 | if (pos.col <= 0 || ((len == 0 && pos.col > 1) |
15615 | - || (len > 0 && pos.col > len))) | |
15615 | + || (len > 0 && (int)pos.col > len))) | |
15616 | 15616 | return NULL; /* invalid column number */ |
15617 | 15617 | |
15618 | 15618 | pos.col--; |
@@ -941,6 +941,8 @@ | ||
941 | 941 | EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), |
942 | 942 | EX(CMD_undo, "undo", ex_undo, |
943 | 943 | TRLBAR|CMDWIN), |
944 | +EX(CMD_undojoin, "undojoin", ex_undojoin, | |
945 | + TRLBAR|CMDWIN), | |
944 | 946 | EX(CMD_unabbreviate, "unabbreviate", ex_abbreviate, |
945 | 947 | EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), |
946 | 948 | EX(CMD_unhide, "unhide", ex_buffer_all, |
@@ -19,6 +19,7 @@ | ||
19 | 19 | int mch_setperm __ARGS((char_u *name, long perm)); |
20 | 20 | void mch_hide __ARGS((char_u *name)); |
21 | 21 | int mch_isdir __ARGS((char_u *name)); |
22 | +int mch_is_linked __ARGS((char_u *fname)); | |
22 | 23 | int mch_writable __ARGS((char_u *name)); |
23 | 24 | int mch_can_exe __ARGS((char_u *name)); |
24 | 25 | int mch_nodetype __ARGS((char_u *name)); |
@@ -6128,7 +6128,7 @@ | ||
6128 | 6128 | "SpellRare term=reverse ctermbg=Magenta guisp=Magenta gui=undercurl", |
6129 | 6129 | "SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl", |
6130 | 6130 | "Pmenu ctermbg=Magenta guibg=Magenta", |
6131 | - "PmenuSel ctermbg=Grey guibg=Grey", | |
6131 | + "PmenuSel ctermbg=DarkGrey guibg=DarkGrey", | |
6132 | 6132 | "Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta", |
6133 | 6133 | "WarningMsg term=standout ctermfg=LightRed guifg=Red", |
6134 | 6134 | "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black", |
@@ -1,6 +1,6 @@ | ||
1 | 1 | " Vim script language tests |
2 | 2 | " Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com> |
3 | -" Last Change: 2005 Jun 18 | |
3 | +" Last Change: 2006 Feb 28 | |
4 | 4 | |
5 | 5 | "------------------------------------------------------------------------------- |
6 | 6 | " Test environment {{{1 |
@@ -382,11 +382,6 @@ | ||
382 | 382 | let func_start = line(".") |
383 | 383 | let func_name = substitute(theline, |
384 | 384 | \ '^\s*fu\%[nction]!\=\s*\(\%(\u\|s:\)\w*\).*', '\1', "") |
385 | - let func_conts = 0 | |
386 | - elseif theline =~ '^\s*\\' | |
387 | - if in_func | |
388 | - let func_conts = func_conts + 1 | |
389 | - endif | |
390 | 385 | elseif theline =~ '^\s*endf' |
391 | 386 | " End of function definition. |
392 | 387 | let in_func = 0 |
@@ -411,7 +406,7 @@ | ||
411 | 406 | " Add the function breakpoint and note the number of quits |
412 | 407 | " to be used, if specified, or one for every call else. |
413 | 408 | let breakpoints = breakpoints . " -c 'breakadd func " . |
414 | - \ (line(".") - func_start - func_conts) . " " . | |
409 | + \ (line(".") - func_start) . " " . | |
415 | 410 | \ func_name . "'" |
416 | 411 | if quits != "" |
417 | 412 | let debug_quits = debug_quits . quits |
@@ -845,6 +845,28 @@ | ||
845 | 845 | } |
846 | 846 | |
847 | 847 | /* |
848 | + * ":undojoin": continue adding to the last entry list | |
849 | + */ | |
850 | +/*ARGSUSED*/ | |
851 | + void | |
852 | +ex_undojoin(eap) | |
853 | + exarg_T *eap; | |
854 | +{ | |
855 | + if (!curbuf->b_u_synced) | |
856 | + return; /* already unsynced */ | |
857 | + if (curbuf->b_u_newhead == NULL) | |
858 | + return; /* nothing changed before */ | |
859 | + if (p_ul < 0) | |
860 | + return; /* no entries, nothing to do */ | |
861 | + else | |
862 | + { | |
863 | + /* Go back to the last entry */ | |
864 | + curbuf->b_u_curhead = curbuf->b_u_newhead; | |
865 | + curbuf->b_u_synced = FALSE; /* no entries, nothing to do */ | |
866 | + } | |
867 | +} | |
868 | + | |
869 | +/* | |
848 | 870 | * Called after writing the file and setting b_changed to FALSE. |
849 | 871 | * Now an undo means that the buffer is modified. |
850 | 872 | */ |
@@ -36,5 +36,5 @@ | ||
36 | 36 | #define VIM_VERSION_NODOT "vim70aa" |
37 | 37 | #define VIM_VERSION_SHORT "7.0aa" |
38 | 38 | #define VIM_VERSION_MEDIUM "7.0aa ALPHA" |
39 | -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 27)" | |
40 | -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 27, compiled " | |
39 | +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 28)" | |
40 | +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 28, compiled " |