Changeset 19a023f

Timestamp:

Jul 11, 2009, 1:14:36 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

0190c4d

Parents:

2fc8397

git-author:

Nelson Elhage <nelhage@mit.edu> (07/06/09 20:42:13)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/11/09 13:14:36)

Message:

Refactor owl_editwin_replace to allow more internal uses.

File:

• editwin.c (modified) (3 diffs)

editwin.c

@@ -56 +56 @@
 static int owl_editwin_is_char_in(owl_editwin *e, char *set);
 static gunichar owl_editwin_get_char_at_point(owl_editwin *e);
+static int owl_editwin_replace_internal(owl_editwin *e, int replace, char *s);
 static char *oe_copy_buf(owl_editwin *e, char *buf, int len);
 static int oe_copy_region(owl_editwin *e);
@@ -564 +565 @@
 }
 
-/* replace count characters at the point with s, returning the change in size */
+/* replace 'replace' characters at the point with s, returning the change in size */
 int owl_editwin_replace(owl_editwin *e, int replace, char *s)
 {
-  int start, end, i, free, need, size, change;
+  int start, end, i;
   char *p;
-  oe_excursion *x;
 
   if (!g_utf8_validate(s, -1, NULL)) {
@@ -583 +583 @@
   else
     end = e->bufflen;
+
+  return owl_editwin_replace_internal(e, end - start, s);
+}
+
+static int owl_editwin_replace_internal(owl_editwin *e, int replace, char *s)
+{
+  int start, end, free, need, size, change;
+  oe_excursion *x;
+  char *p;
+
+  start = e->index;
+  end   = start + replace;
 
   free = e->allocated - e->bufflen + end - start;