summaryrefslogtreecommitdiff
path: root/src/if_ruby.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-06-20 19:10:43 +0000
committerBram Moolenaar <Bram@vim.org>2006-06-20 19:10:43 +0000
commit20ff79237a8ec91a43eaed49c9a38d3155ca2a5c (patch)
tree424864df22bf52822b97428fc1c4b09e5384e290 /src/if_ruby.c
parent4169da7845ed24b03cd6208c1acb27eba774a971 (diff)
downloadvim-git-20ff79237a8ec91a43eaed49c9a38d3155ca2a5c.tar.gz
updated for version 7.0-022v7.0.022
Diffstat (limited to 'src/if_ruby.c')
-rw-r--r--src/if_ruby.c96
1 files changed, 79 insertions, 17 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 29c62b814..3685db0bc 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -643,11 +643,23 @@ static VALUE buffer_aref(VALUE self, VALUE num)
static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
{
- buf_T *savebuf = curbuf;
- char *line = STR2CSTR(str);
+ char *line = STR2CSTR(str);
+#ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+#else
+ buf_T *save_curbuf = curbuf;
+#endif
- if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
+ if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+ {
+#ifdef FEAT_AUTOCMD
+ /* set curwin/curbuf for "buf" and save some things */
+ aucmd_prepbuf(&aco, buf);
+#else
curbuf = buf;
+ curwin->w_buffer = buf;
+#endif
+
if (u_savesub(n) == OK) {
ml_replace(n, (char_u *)line, TRUE);
changed();
@@ -655,10 +667,19 @@ static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
syn_changed(n); /* recompute syntax hl. for this line */
#endif
}
- curbuf = savebuf;
+
+#ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "buf" invalid! */
+#else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+#endif
update_curbuf(NOT_VALID);
}
- else {
+ else
+ {
rb_raise(rb_eIndexError, "index %d out of buffer", n);
return Qnil; /* For stop warning */
}
@@ -676,12 +697,24 @@ static VALUE buffer_aset(VALUE self, VALUE num, VALUE str)
static VALUE buffer_delete(VALUE self, VALUE num)
{
- buf_T *buf = get_buf(self);
- buf_T *savebuf = curbuf;
- long n = NUM2LONG(num);
+ buf_T *buf = get_buf(self);
+ long n = NUM2LONG(num);
+#ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+#else
+ buf_T *save_curbuf = curbuf;
+#endif
- if (n > 0 && n <= buf->b_ml.ml_line_count) {
+ if (n > 0 && n <= buf->b_ml.ml_line_count)
+ {
+#ifdef FEAT_AUTOCMD
+ /* set curwin/curbuf for "buf" and save some things */
+ aucmd_prepbuf(&aco, buf);
+#else
curbuf = buf;
+ curwin->w_buffer = buf;
+#endif
+
if (u_savedel(n, 1) == OK) {
ml_delete(n, 0);
@@ -691,10 +724,19 @@ static VALUE buffer_delete(VALUE self, VALUE num)
changed();
}
- curbuf = savebuf;
+
+#ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "buf" invalid! */
+#else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+#endif
update_curbuf(NOT_VALID);
}
- else {
+ else
+ {
rb_raise(rb_eIndexError, "index %d out of buffer", n);
}
return Qnil;
@@ -702,13 +744,25 @@ static VALUE buffer_delete(VALUE self, VALUE num)
static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
{
- buf_T *buf = get_buf(self);
- buf_T *savebuf = curbuf;
- char *line = STR2CSTR(str);
- long n = NUM2LONG(num);
+ buf_T *buf = get_buf(self);
+ char *line = STR2CSTR(str);
+ long n = NUM2LONG(num);
+#ifdef FEAT_AUTOCMD
+ aco_save_T aco;
+#else
+ buf_T *save_curbuf = curbuf;
+#endif
- if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
+ if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+ {
+#ifdef FEAT_AUTOCMD
+ /* set curwin/curbuf for "buf" and save some things */
+ aucmd_prepbuf(&aco, buf);
+#else
curbuf = buf;
+ curwin->w_buffer = buf;
+#endif
+
if (u_inssub(n + 1) == OK) {
ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
@@ -718,7 +772,15 @@ static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
changed();
}
- curbuf = savebuf;
+
+#ifdef FEAT_AUTOCMD
+ /* restore curwin/curbuf and a few other things */
+ aucmd_restbuf(&aco);
+ /* Careful: autocommands may have made "buf" invalid! */
+#else
+ curwin->w_buffer = save_curbuf;
+ curbuf = save_curbuf;
+#endif
update_curbuf(NOT_VALID);
}
else {