OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • SSH
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisióndd9db57ee7ce46bdc86cd787fb58907f20c0a973 (tree)
Tiempo2005-07-29 07:36:45
Autorvimboss
Commitervimboss

Log Message

updated for version 7.0118

Cambiar Resumen

Diferencia incremental

diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/doc/eval.txt
--- a/runtime/doc/eval.txt Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/doc/eval.txt Thu Jul 28 22:36:45 2005 +0000
@@ -1,4 +1,4 @@
1-*eval.txt* For Vim version 7.0aa. Last change: 2005 Jul 25
1+*eval.txt* For Vim version 7.0aa. Last change: 2005 Jul 28
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2416,29 +2416,24 @@
24162416
24172417 *getbufline()*
24182418 getbufline({expr}, {lnum} [, {end}])
2419- Return the lines starting from {lnum} to {end} in the buffer
2420- {expr} as a List. If {end} is omitted, only the line {lnum}
2421- is returned.
2419+ Return a List with the lines starting from {lnum} to {end}
2420+ (inclusive) in the buffer {expr}. If {end} is omitted, a List
2421+ with only the line {lnum} is returned.
24222422
24232423 For the use of {expr}, see |bufname()| above.
24242424
2425- When {lnum} is a String that doesn't start with a
2426- digit, line() is called to translate the String into a Number.
2427-
2428- {end} is used in the same way as {lnum}.
2425+ For {lnum} and {end} "$" can be used for the last line of the
2426+ buffer. Otherwise a number must be used.
24292427
24302428 When {lnum} is smaller than 1 or bigger than the number of
24312429 lines in the buffer, an empty List is returned.
24322430
24332431 When {end} is greater than the number of lines in the buffer,
24342432 it is treated as {end} is set to the number of lines in the
2435- buffer.
2436-
2437- When non-existing line ranges are specified, an empty List is
2438- returned. When {end} is before {lnum} an empty List is
2433+ buffer. When {end} is before {lnum} an empty List is
24392434 returned.
24402435
2441- This function works only for loaded buffers. For unloaded and
2436+ This function works only for loaded buffers. For unloaded and
24422437 non-existing buffers, an empty List is returned.
24432438
24442439 Example: >
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/doc/options.txt
--- a/runtime/doc/options.txt Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/doc/options.txt Thu Jul 28 22:36:45 2005 +0000
@@ -1,4 +1,4 @@
1-*options.txt* For Vim version 7.0aa. Last change: 2005 Jul 26
1+*options.txt* For Vim version 7.0aa. Last change: 2005 Jul 28
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2282,9 +2282,11 @@
22822282 |viminfo-file|. And Vim expects the terminal to use utf-8 too. Thus
22832283 setting 'encoding' to one of these values instead of utf-8 only has
22842284 effect for encoding used for files when 'fileencoding' is empty.
2285-
2286- When 'encoding' is set to a Unicode encoding, and 'fileencodings' was
2287- not set yet, the default for 'fileencodings' is changed.
2285+ "utf-16" is NOT supported (and probably never will be, since it's such
2286+ an ugly encoding). *utf-16*
2287+
2288+ When 'encoding' is set to a Unicode encoding, and 'fileencodings' was
2289+ not set yet, the default for 'fileencodings' is changed.
22882290
22892291 *'endofline'* *'eol'* *'noendofline'* *'noeol'*
22902292 'endofline' 'eol' boolean (default on)
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/doc/syntax.txt
--- a/runtime/doc/syntax.txt Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/doc/syntax.txt Thu Jul 28 22:36:45 2005 +0000
@@ -1,4 +1,4 @@
1-*syntax.txt* For Vim version 7.0aa. Last change: 2005 Jul 18
1+*syntax.txt* For Vim version 7.0aa. Last change: 2005 Jul 28
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3641,6 +3641,15 @@
36413641 result is like this single command has been used: >
36423642 :hi Comment term=bold ctermfg=Cyan guifg=#80a0ff gui=bold
36433643 <
3644+When listing a highlight group and 'verbose' is non-zero, the listing will
3645+also tell where it was last set. Example: >
3646+ :verbose hi Comment
3647+< Comment xxx term=bold ctermfg=4 guifg=Blue ~
3648+ Last set from /home/mool/vim/vim7/runtime/syntax/syncolor.vim ~
3649+
3650+For details about when this message is given and when it's valid see
3651+|:set-verbose|.
3652+
36443653 *highlight-args* *E416* *E417* *E423*
36453654 There are three types of terminals for highlighting:
36463655 term a normal terminal (vt100, xterm)
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/doc/tags
--- a/runtime/doc/tags Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/doc/tags Thu Jul 28 22:36:45 2005 +0000
@@ -4984,6 +4984,7 @@
49844984 g:netrw_rmf_cmd pi_netrw.txt /*g:netrw_rmf_cmd*
49854985 g:var eval.txt /*g:var*
49864986 g; motion.txt /*g;*
4987+g< message.txt /*g<*
49874988 g<Down> motion.txt /*g<Down>*
49884989 g<End> motion.txt /*g<End>*
49894990 g<Home> motion.txt /*g<Home>*
@@ -6746,6 +6747,7 @@
67466747 usr_45.txt usr_45.txt /*usr_45.txt*
67476748 usr_90.txt usr_90.txt /*usr_90.txt*
67486749 usr_toc.txt usr_toc.txt /*usr_toc.txt*
6750+utf-16 options.txt /*utf-16*
67496751 utf-8 mbyte.txt /*utf-8*
67506752 utf-8-char-arg mbyte.txt /*utf-8-char-arg*
67516753 utf-8-in-xwindows mbyte.txt /*utf-8-in-xwindows*
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/doc/todo.txt Thu Jul 28 22:36:45 2005 +0000
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 27
1+*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 28
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,6 +30,8 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33+Is it simple to let ":verbose hi mailSubject" mention where it was last set?
34+
3335 Mac unicode patch (Da Woon Jung):
3436 - selecting proportional font breaks display
3537 - UTF-8 text causes display problems. Font replacement causes this.
@@ -52,8 +54,6 @@
5254 - Win32: tearoff menu window should have a scrollbar when it's taller than
5355 the screen.
5456 - mblen(NULL, 0) also in Vim 6.3?
55-- Win32: Crash when pasting Simplified Chinese in utf-8. (rainux, 2005 June
56- 20)
5757
5858
5959 PLANNED FOR VERSION 7.0:
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/doc/version7.txt
--- a/runtime/doc/version7.txt Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/doc/version7.txt Thu Jul 28 22:36:45 2005 +0000
@@ -1,4 +1,4 @@
1-*version7.txt* For Vim version 7.0aa. Last change: 2005 Jul 27
1+*version7.txt* For Vim version 7.0aa. Last change: 2005 Jul 28
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -238,6 +238,9 @@
238238 commands and highlighting is kept. Only works when the 'more' option is set.
239239 Previously it only partly worked for ":clist".
240240
241+The |g<| command can be used to see the last page of messages after you have
242+hit <Enter> at the |hit-enter-prompt|. Then you can scroll further back.
243+
241244
242245 POSIX compatibility *new-posix*
243246 -------------------
@@ -724,6 +727,9 @@
724727 The 's' flag is added to the search() and searchpair() function to set the
725728 ' mark if the cursor is moved. (Yegappan Lakshmanan)
726729
730+When 'verbose' is set the output of ":highlight" will show where a highlight
731+item was last set.
732+
727733 ==============================================================================
728734 COMPILE TIME CHANGES *compile-changes-7*
729735
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/spell/de/main.aap
--- a/runtime/spell/de/main.aap Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/spell/de/main.aap Thu Jul 28 22:36:45 2005 +0000
@@ -14,11 +14,11 @@
1414
1515 $(SPELLDIR)/de.latin1.spl : $(VIM) $(FILES)
1616 :sys env LANG=de_DE.ISO8859-1
17- $(VIM) -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q
17+ $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q
1818
1919 $(SPELLDIR)/de.utf-8.spl : $(VIM) $(FILES)
2020 :sys env LANG=de_DE.UTF-8
21- $(VIM) -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q
21+ $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q
2222
2323 ../README_de.txt: README_de_DE_comb.txt
2424 :copy $source $target
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/spell/en/main.aap
--- a/runtime/spell/en/main.aap Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/spell/en/main.aap Thu Jul 28 22:36:45 2005 +0000
@@ -18,16 +18,16 @@
1818
1919 $(SPELLDIR)/en.latin1.spl : $(VIM) $(FILES)
2020 :sys env LANG=en_US.ISO8859-1
21- $(VIM) -e -c "mkspell! $(SPELLDIR)/en en_US en_AU en_CA en_GB
22- en_NZ" -c q
21+ $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/en
22+ en_US en_AU en_CA en_GB en_NZ" -c q
2323
2424 $(SPELLDIR)/en.utf-8.spl : $(VIM) $(FILES)
2525 :sys env LANG=en_US.UTF-8
26- $(VIM) -e -c "mkspell! $(SPELLDIR)/en en_US en_AU en_CA en_GB
27- en_NZ" -c q
26+ $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/en
27+ en_US en_AU en_CA en_GB en_NZ" -c q
2828
2929 $(SPELLDIR)/en.ascii.spl : $(VIM) $(FILES)
30- :sys $(VIM) -e -c "mkspell! -ascii $(SPELLDIR)/en
30+ :sys $(VIM) -u NONE -e -c "mkspell! -ascii $(SPELLDIR)/en
3131 en_US en_AU en_CA en_GB en_NZ" -c q
3232
3333 ../README_en.txt: README_en_US.txt README_en_AU.txt
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/spell/he/main.aap
--- a/runtime/spell/he/main.aap Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/spell/he/main.aap Thu Jul 28 22:36:45 2005 +0000
@@ -13,10 +13,10 @@
1313
1414 $(SPELLDIR)/he.utf-8.spl : $(VIM) $(FILES)
1515 :sys env LANG=he_IL.UTF-8
16- $(VIM) -e -c "mkspell! $(SPELLDIR)/he he_IL" -c q
16+ $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/he he_IL" -c q
1717
1818 $(SPELLDIR)/he.iso-8859-8.spl : $(VIM) $(FILES)
19- :sys $(VIM) -e -c "set enc=iso-8859-8"
19+ :sys $(VIM) -u NONE -e -c "set enc=iso-8859-8"
2020 -c "mkspell! $(SPELLDIR)/he he_IL" -c q
2121
2222 ../README_he.txt : README_he_IL.txt
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/spell/nl/main.aap
--- a/runtime/spell/nl/main.aap Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/spell/nl/main.aap Thu Jul 28 22:36:45 2005 +0000
@@ -13,11 +13,11 @@
1313
1414 $(SPELLDIR)/nl.latin1.spl : $(VIM) $(FILES)
1515 :sys env LANG=nl_NL.ISO8859-1
16- $(VIM) -e -c "mkspell! $(SPELLDIR)/nl nl_NL" -c q
16+ $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/nl nl_NL" -c q
1717
1818 $(SPELLDIR)/nl.utf-8.spl : $(VIM) $(FILES)
1919 :sys env LANG=nl_NL.UTF-8
20- $(VIM) -e -c "mkspell! $(SPELLDIR)/nl nl_NL" -c q
20+ $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/nl nl_NL" -c q
2121
2222 ../README_nl.txt : README_nl_NL.txt
2323 :copy $source $target
diff -r 8347d456f7e5 -r dd9db57ee7ce runtime/spell/pl/main.aap
--- a/runtime/spell/pl/main.aap Thu Jul 28 22:28:16 2005 +0000
+++ b/runtime/spell/pl/main.aap Thu Jul 28 22:36:45 2005 +0000
@@ -13,13 +13,13 @@
1313 $(SPELLDIR)/pl.cp1250.spl ../README_pl.txt
1414
1515 $(SPELLDIR)/pl.iso-8859-2.spl : $(VIM) $(FILES)
16- :sys env LANG=pl_PL.ISO8859-2 $(VIM) -e -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q
16+ :sys env LANG=pl_PL.ISO8859-2 $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q
1717
1818 $(SPELLDIR)/pl.utf-8.spl : $(VIM) $(FILES)
19- :sys env LANG=pl_PL.UTF-8 $(VIM) -e -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q
19+ :sys env LANG=pl_PL.UTF-8 $(VIM) -u NONE -e -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q
2020
2121 $(SPELLDIR)/pl.cp1250.spl : $(VIM) $(FILES)
22- :sys $(VIM) -e -c "set enc=cp1250" -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q
22+ :sys $(VIM) -u NONE -e -c "set enc=cp1250" -c "mkspell! $(SPELLDIR)/pl pl_PL" -c q
2323
2424 ../README_pl.txt: README_pl_PL.txt
2525 :copy $source $target
diff -r 8347d456f7e5 -r dd9db57ee7ce src/eval.c
--- a/src/eval.c Thu Jul 28 22:28:16 2005 +0000
+++ b/src/eval.c Thu Jul 28 22:36:45 2005 +0000
@@ -643,6 +643,7 @@
643643 static long get_tv_number __ARGS((typval_T *varp));
644644 static long get_tv_number_chk __ARGS((typval_T *varp, int *denote));
645645 static linenr_T get_tv_lnum __ARGS((typval_T *argvars));
646+static linenr_T get_tv_lnum_buf __ARGS((typval_T *argvars, buf_T *buf));
646647 static char_u *get_tv_string __ARGS((typval_T *varp));
647648 static char_u *get_tv_string_buf __ARGS((typval_T *varp, char_u *buf));
648649 static char_u *get_tv_string_chk __ARGS((typval_T *varp));
@@ -9187,11 +9188,12 @@
91879188 buf = get_buf_tv(&argvars[0]);
91889189 --emsg_off;
91899190
9190- lnum = get_tv_lnum(&argvars[1]);
9191+ lnum = get_tv_lnum_buf(&argvars[1], buf);
91919192 if (argvars[2].v_type == VAR_UNKNOWN)
91929193 end = lnum;
91939194 else
9194- end = get_tv_lnum(&argvars[2]);
9195+ end = get_tv_lnum_buf(&argvars[2], buf);
9196+
91959197 get_buffer_lines(buf, lnum, end, TRUE, rettv);
91969198 }
91979199
@@ -15651,7 +15653,8 @@
1565115653 }
1565215654
1565315655 /*
15654- * Get the lnum from the first argument. Also accepts ".", "$", etc.
15656+ * Get the lnum from the first argument.
15657+ * Also accepts ".", "$", etc., but that only works for the current buffer.
1565515658 * Returns -1 on error.
1565615659 */
1565715660 static linenr_T
@@ -15673,6 +15676,24 @@
1567315676 }
1567415677
1567515678 /*
15679+ * Get the lnum from the first argument.
15680+ * Also accepts "$", then "buf" is used.
15681+ * Returns 0 on error.
15682+ */
15683+ static linenr_T
15684+get_tv_lnum_buf(argvars, buf)
15685+ typval_T *argvars;
15686+ buf_T *buf;
15687+{
15688+ if (argvars[0].v_type == VAR_STRING
15689+ && argvars[0].vval.v_string != NULL
15690+ && argvars[0].vval.v_string[0] == '$'
15691+ && buf != NULL)
15692+ return buf->b_ml.ml_line_count;
15693+ return get_tv_number_chk(&argvars[0], NULL);
15694+}
15695+
15696+/*
1567615697 * Get the string value of a variable.
1567715698 * If it is a Number variable, the number is converted into a string.
1567815699 * get_tv_string() uses a single, static buffer. YOU CAN ONLY USE IT ONCE!
@@ -18678,6 +18699,23 @@
1867818699 }
1867918700 #endif
1868018701
18702+/*
18703+ * Display script name where an item was last set.
18704+ * Should only be invoked when 'verbose' is non-zero.
18705+ */
18706+ void
18707+last_set_msg(scriptID)
18708+ scid_T scriptID;
18709+{
18710+ if (scriptID != 0)
18711+ {
18712+ verbose_enter();
18713+ MSG_PUTS(_("\n\tLast set from "));
18714+ MSG_PUTS(get_scriptname(scriptID));
18715+ verbose_leave();
18716+ }
18717+}
18718+
1868118719 #endif /* FEAT_EVAL */
1868218720
1868318721 #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
diff -r 8347d456f7e5 -r dd9db57ee7ce src/main.c
--- a/src/main.c Thu Jul 28 22:28:16 2005 +0000
+++ b/src/main.c Thu Jul 28 22:36:45 2005 +0000
@@ -1034,7 +1034,7 @@
10341034 emsg_on_display = FALSE; /* can delete error message now */
10351035 did_emsg = FALSE;
10361036 msg_didany = FALSE; /* reset lines_left in msg_start() */
1037- clear_sb_text(); /* clear scroll-back text */
1037+ may_clear_sb_text(); /* clear scroll-back text on next msg */
10381038 showruler(FALSE);
10391039
10401040 setcursor();
diff -r 8347d456f7e5 -r dd9db57ee7ce src/misc2.c
--- a/src/misc2.c Thu Jul 28 22:28:16 2005 +0000
+++ b/src/misc2.c Thu Jul 28 22:36:45 2005 +0000
@@ -870,10 +870,13 @@
870870 if (releasing)
871871 break;
872872 releasing = TRUE;
873- try_again = mf_release_all();
873+
874+ clear_sb_text(); /* free any scrollback text */
875+ try_again = mf_release_all(); /* release as many blocks as possible */
874876 #ifdef FEAT_EVAL
875- try_again |= garbage_collect();
876-#endif
877+ try_again |= garbage_collect(); /* cleanup recursive lists/dicts */
878+#endif
879+
877880 releasing = FALSE;
878881 if (!try_again)
879882 break;
diff -r 8347d456f7e5 -r dd9db57ee7ce src/option.c
--- a/src/option.c Thu Jul 28 22:28:16 2005 +0000
+++ b/src/option.c Thu Jul 28 22:36:45 2005 +0000
@@ -3814,15 +3814,7 @@
38143814 showoneopt(&options[opt_idx], opt_flags);
38153815 #ifdef FEAT_EVAL
38163816 if (p_verbose > 0)
3817- {
3818- if (options[opt_idx].scriptID != 0)
3819- {
3820- verbose_enter();
3821- MSG_PUTS(_("\n\tLast set from "));
3822- MSG_PUTS(get_scriptname(options[opt_idx].scriptID));
3823- verbose_leave();
3824- }
3825- }
3817+ last_set_msg(options[opt_idx].scriptID);
38263818 #endif
38273819 }
38283820 else
diff -r 8347d456f7e5 -r dd9db57ee7ce src/po/Makefile
--- a/src/po/Makefile Thu Jul 28 22:28:16 2005 +0000
+++ b/src/po/Makefile Thu Jul 28 22:36:45 2005 +0000
@@ -27,6 +27,7 @@
2727 zh_CN.UTF-8 \
2828 zh_TW \
2929 zh_TW.UTF-8 \
30+# end marker
3031
3132 MOFILES = \
3233 af.mo \
@@ -51,6 +52,7 @@
5152 zh_CN.mo \
5253 zh_TW.UTF-8.mo \
5354 zh_TW.mo \
55+# end marker
5456
5557 CONVERTED = \
5658 cs.cp1250.mo \
@@ -60,6 +62,7 @@
6062 sk.cp1250.mo \
6163 uk.cp1251.mo \
6264 zh_CN.cp936.mo \
65+# end marker
6366
6467 CHECKFILES = \
6568 af.ck \
@@ -91,6 +94,7 @@
9194 sk.cp1250.ck \
9295 uk.cp1251.ck \
9396 zh_CN.cp936.ck \
97+# end marker
9498
9599 PACKAGE = vim
96100 SHELL = /bin/sh
diff -r 8347d456f7e5 -r dd9db57ee7ce src/proto/eval.pro
--- a/src/proto/eval.pro Thu Jul 28 22:28:16 2005 +0000
+++ b/src/proto/eval.pro Thu Jul 28 22:36:45 2005 +0000
@@ -86,6 +86,7 @@
8686 int read_viminfo_varlist __ARGS((vir_T *virp, int writing));
8787 void write_viminfo_varlist __ARGS((FILE *fp));
8888 int store_session_globals __ARGS((FILE *fd));
89+void last_set_msg __ARGS((scid_T scriptID));
8990 int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen));
9091 char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags));
9192 /* vim: set ft=c : */
diff -r 8347d456f7e5 -r dd9db57ee7ce src/proto/message.pro
--- a/src/proto/message.pro Thu Jul 28 22:28:16 2005 +0000
+++ b/src/proto/message.pro Thu Jul 28 22:36:45 2005 +0000
@@ -39,7 +39,9 @@
3939 void msg_puts_long_attr __ARGS((char_u *longstr, int attr));
4040 void msg_puts_long_len_attr __ARGS((char_u *longstr, int len, int attr));
4141 void msg_puts_attr __ARGS((char_u *s, int attr));
42+void may_clear_sb_text __ARGS((void));
4243 void clear_sb_text __ARGS((void));
44+void show_sb_text __ARGS((void));
4345 int msg_use_printf __ARGS((void));
4446 void mch_errmsg __ARGS((char *str));
4547 void mch_msg __ARGS((char *str));
diff -r 8347d456f7e5 -r dd9db57ee7ce src/syntax.c
--- a/src/syntax.c Thu Jul 28 22:28:16 2005 +0000
+++ b/src/syntax.c Thu Jul 28 22:36:45 2005 +0000
@@ -51,6 +51,9 @@
5151 #endif
5252 int sg_link; /* link to this highlight group ID */
5353 int sg_set; /* combination of SG_* flags */
54+#ifdef FEAT_EVAL
55+ scid_T sg_scriptID; /* script in which the group was last set */
56+#endif
5457 };
5558
5659 #define SG_TERM 1 /* term has been set */
@@ -6352,6 +6355,9 @@
63526355 if (!init)
63536356 HL_TABLE()[from_id - 1].sg_set |= SG_LINK;
63546357 HL_TABLE()[from_id - 1].sg_link = to_id;
6358+#ifdef FEAT_EVAL
6359+ HL_TABLE()[from_id - 1].sg_scriptID = current_SID;
6360+#endif
63556361 redraw_all_later(NOT_VALID);
63566362 }
63576363 }
@@ -7101,6 +7107,9 @@
71017107 #endif
71027108 else
71037109 set_hl_attr(idx);
7110+#ifdef FEAT_EVAL
7111+ HL_TABLE()[idx].sg_scriptID = current_SID;
7112+#endif
71047113 redraw_all_later(NOT_VALID);
71057114 }
71067115 vim_free(key);
@@ -7201,6 +7210,12 @@
72017210 HL_TABLE()[idx].sg_font_name = NULL;
72027211 HL_TABLE()[idx].sg_gui_attr = 0;
72037212 #endif
7213+#ifdef FEAT_EVAL
7214+ /* Clear the script ID only when there is no link, since that is not
7215+ * cleared. */
7216+ if (HL_TABLE()[idx].sg_link == 0)
7217+ HL_TABLE()[idx].sg_scriptID = 0;
7218+#endif
72047219 }
72057220
72067221 #if defined(FEAT_GUI) || defined(PROTO)
@@ -7868,13 +7883,19 @@
78687883 0, sgp->sg_font_name, "font");
78697884 #endif
78707885
7871- if (sgp->sg_link)
7886+ if (sgp->sg_link && !got_int)
78727887 {
78737888 (void)syn_list_header(didh, 9999, id);
7889+ didh = TRUE;
78747890 msg_puts_attr((char_u *)"links to", hl_attr(HLF_D));
78757891 msg_putchar(' ');
78767892 msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name);
78777893 }
7894+
7895+#ifdef FEAT_EVAL
7896+ if (didh && p_verbose > 0)
7897+ last_set_msg(sgp->sg_scriptID);
7898+#endif
78787899 }
78797900
78807901 static int
@@ -7890,6 +7911,8 @@
78907911 char_u *ts;
78917912 int i;
78927913
7914+ if (got_int)
7915+ return FALSE;
78937916 if (type == LIST_STRING ? (sarg != NULL) : (iarg != 0))
78947917 {
78957918 ts = buf;
@@ -7915,10 +7938,12 @@
79157938 (void)syn_list_header(didh,
79167939 (int)(vim_strsize(ts) + STRLEN(name) + 1), id);
79177940 didh = TRUE;
7918-
7919- MSG_PUTS_ATTR(name, hl_attr(HLF_D));
7920- MSG_PUTS_ATTR("=", hl_attr(HLF_D));
7921- msg_outtrans(ts);
7941+ if (!got_int)
7942+ {
7943+ MSG_PUTS_ATTR(name, hl_attr(HLF_D));
7944+ MSG_PUTS_ATTR("=", hl_attr(HLF_D));
7945+ msg_outtrans(ts);
7946+ }
79227947 }
79237948 return didh;
79247949 }
@@ -8068,11 +8093,17 @@
80688093 if (!did_header)
80698094 {
80708095 msg_putchar('\n');
8096+ if (got_int)
8097+ return TRUE;
80718098 msg_outtrans(HL_TABLE()[id - 1].sg_name);
80728099 endcol = 15;
80738100 }
80748101 else if (msg_col + outlen + 1 >= Columns)
8102+ {
80758103 msg_putchar('\n');
8104+ if (got_int)
8105+ return TRUE;
8106+ }
80768107 else
80778108 {
80788109 if (msg_col >= endcol) /* wrap around is like starting a new line */
diff -r 8347d456f7e5 -r dd9db57ee7ce src/version.h
--- a/src/version.h Thu Jul 28 22:28:16 2005 +0000
+++ b/src/version.h Thu Jul 28 22:36:45 2005 +0000
@@ -36,5 +36,5 @@
3636 #define VIM_VERSION_NODOT "vim70aa"
3737 #define VIM_VERSION_SHORT "7.0aa"
3838 #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
39-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 27)"
40-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 27, compiled "
39+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 28)"
40+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 28, compiled "
Show on old repository browser