OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw
  • R/O
  • SSH
Fork

vim: 提交

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


Commit MetaInfo

修訂d5ec1b42ceb06062f03d828acca852a4ccfbc7a4 (tree)
時間2005-07-21 07:06:07
作者vimboss
Commitervimboss

Log Message

updated for version 7.0111

Change Summary

差異

diff -r 1ec6b77beee0 -r d5ec1b42ceb0 runtime/syntax/html.vim
--- a/runtime/syntax/html.vim Wed Jul 20 22:04:36 2005 +0000
+++ b/runtime/syntax/html.vim Wed Jul 20 22:06:07 2005 +0000
@@ -2,7 +2,7 @@
22 " Language: HTML
33 " Maintainer: Claudio Fleiner <claudio@fleiner.com>
44 " URL: http://www.fleiner.com/vim/syntax/html.vim
5-" Last Change: 2005 Jul 18
5+" Last Change: 2005 Jul 20
66
77 " Please check :help html.vim for some comments and a description of the options
88
@@ -27,7 +27,9 @@
2727
2828 syn case ignore
2929
30-syn spell toplevel
30+if main_syntax == "html"
31+ syn spell toplevel
32+endif
3133
3234 " mark illegal characters
3335 syn match htmlError "[<>&]"
diff -r 1ec6b77beee0 -r d5ec1b42ceb0 src/eval.c
--- a/src/eval.c Wed Jul 20 22:04:36 2005 +0000
+++ b/src/eval.c Wed Jul 20 22:06:07 2005 +0000
@@ -493,6 +493,7 @@
493493 static void f_function __ARGS((typval_T *argvars, typval_T *rettv));
494494 static void f_garbagecollect __ARGS((typval_T *argvars, typval_T *rettv));
495495 static void f_get __ARGS((typval_T *argvars, typval_T *rettv));
496+static void f_getbufline __ARGS((typval_T *argvars, typval_T *rettv));
496497 static void f_getbufvar __ARGS((typval_T *argvars, typval_T *rettv));
497498 static void f_getchar __ARGS((typval_T *argvars, typval_T *rettv));
498499 static void f_getcharmod __ARGS((typval_T *argvars, typval_T *rettv));
@@ -6676,6 +6677,7 @@
66766677 {"function", 1, 1, f_function},
66776678 {"garbagecollect", 0, 0, f_garbagecollect},
66786679 {"get", 2, 3, f_get},
6680+ {"getbufline", 2, 3, f_getbufline},
66796681 {"getbufvar", 2, 2, f_getbufvar},
66806682 {"getchar", 0, 1, f_getchar},
66816683 {"getcharmod", 0, 0, f_getcharmod},
@@ -9076,6 +9078,101 @@
90769078 copy_tv(tv, rettv);
90779079 }
90789080
9081+static void get_buffer_lines __ARGS((buf_T *buf, linenr_T start, linenr_T end, typval_T *rettv));
9082+
9083+/*
9084+ * Get line or list of lines from buffer "buf" into "rettv".
9085+ */
9086+ static void
9087+get_buffer_lines(buf, start, end, rettv)
9088+ buf_T *buf;
9089+ linenr_T start;
9090+ linenr_T end;
9091+ typval_T *rettv;
9092+{
9093+ char_u *p;
9094+ list_T *l;
9095+ listitem_T *li;
9096+
9097+ if (start < 0)
9098+ rettv->vval.v_number = 0; /* failure; error message already given */
9099+ else if (end == 0)
9100+ {
9101+ /* getline(lnum): return one line as a string */
9102+ if (start >= 1 && start <= buf->b_ml.ml_line_count)
9103+ p = ml_get_buf(buf, start, FALSE);
9104+ else
9105+ p = (char_u *)"";
9106+
9107+ rettv->v_type = VAR_STRING;
9108+ rettv->vval.v_string = vim_strsave(p);
9109+ }
9110+ else
9111+ {
9112+ if (end < start)
9113+ {
9114+ if (end >= 0) /* else: error message already given */
9115+ EMSG(_(e_invrange));
9116+ rettv->vval.v_number = 0;
9117+ }
9118+ else
9119+ {
9120+ l = list_alloc();
9121+ if (l != NULL)
9122+ {
9123+ if (start < 1)
9124+ start = 1;
9125+ if (end > buf->b_ml.ml_line_count)
9126+ end = buf->b_ml.ml_line_count;
9127+ while (start <= end)
9128+ {
9129+ li = listitem_alloc();
9130+ if (li == NULL)
9131+ break;
9132+ list_append(l, li);
9133+ li->li_tv.v_type = VAR_STRING;
9134+ li->li_tv.v_lock = 0;
9135+ li->li_tv.vval.v_string =
9136+ vim_strsave(ml_get_buf(buf, start++, FALSE));
9137+ }
9138+ rettv->vval.v_list = l;
9139+ rettv->v_type = VAR_LIST;
9140+ ++l->lv_refcount;
9141+ }
9142+ }
9143+ }
9144+}
9145+
9146+/*
9147+ * "getbufline()" function
9148+ */
9149+ static void
9150+f_getbufline(argvars, rettv)
9151+ typval_T *argvars;
9152+ typval_T *rettv;
9153+{
9154+ linenr_T lnum;
9155+ linenr_T end;
9156+ buf_T *buf;
9157+
9158+ (void)get_tv_number(&argvars[0]); /* issue errmsg if type error */
9159+ ++emsg_off;
9160+ buf = get_buf_tv(&argvars[0]);
9161+ --emsg_off;
9162+
9163+ if (buf == NULL || buf->b_ml.ml_mfp == NULL)
9164+ rettv->vval.v_number = 0;
9165+ else
9166+ {
9167+ lnum = get_tv_lnum(&argvars[1]);
9168+ if (argvars[2].v_type == VAR_UNKNOWN)
9169+ end = lnum;
9170+ else
9171+ end = get_tv_lnum(&argvars[2]);
9172+ get_buffer_lines(buf, lnum, end, rettv);
9173+ }
9174+}
9175+
90799176 /*
90809177 * "getbufvar()" function
90819178 */
@@ -9444,7 +9541,7 @@
94449541 }
94459542
94469543 /*
9447- * "getline(lnum)" function
9544+ * "getline(lnum, [end])" function
94489545 */
94499546 static void
94509547 f_getline(argvars, rettv)
@@ -9453,57 +9550,14 @@
94539550 {
94549551 linenr_T lnum;
94559552 linenr_T end;
9456- char_u *p;
9457- list_T *l;
9458- listitem_T *li;
94599553
94609554 lnum = get_tv_lnum(argvars);
9461- if (lnum < 0)
9462- rettv->vval.v_number = 0; /* failure; error message already given */
9463- else if (argvars[1].v_type == VAR_UNKNOWN)
9464- {
9465- if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
9466- p = ml_get(lnum);
9467- else
9468- p = (char_u *)"";
9469-
9470- rettv->v_type = VAR_STRING;
9471- rettv->vval.v_string = vim_strsave(p);
9472- }
9473- else
9474- {
9555+ if (argvars[1].v_type == VAR_UNKNOWN)
9556+ end = 0;
9557+ else
94759558 end = get_tv_lnum(&argvars[1]);
9476- if (end < lnum)
9477- {
9478- if (end >= 0) /* else: error message already given */
9479- EMSG(_(e_invrange));
9480- rettv->vval.v_number = 0;
9481- }
9482- else
9483- {
9484- l = list_alloc();
9485- if (l != NULL)
9486- {
9487- if (lnum < 1)
9488- lnum = 1;
9489- if (end > curbuf->b_ml.ml_line_count)
9490- end = curbuf->b_ml.ml_line_count;
9491- while (lnum <= end)
9492- {
9493- li = listitem_alloc();
9494- if (li == NULL)
9495- break;
9496- list_append(l, li);
9497- li->li_tv.v_type = VAR_STRING;
9498- li->li_tv.v_lock = 0;
9499- li->li_tv.vval.v_string = vim_strsave(ml_get(lnum++));
9500- }
9501- rettv->vval.v_list = l;
9502- rettv->v_type = VAR_LIST;
9503- ++l->lv_refcount;
9504- }
9505- }
9506- }
9559+
9560+ get_buffer_lines(curbuf, lnum, end, rettv);
95079561 }
95089562
95099563 /*
Show on old repository browser