Changeset 72ab15f

Timestamp:

Jul 15, 2009, 10:49:16 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:

3e8ff1e

Parents:

7c83a32

Message:

editwin: Simplify zdot handling.

I'm frankly not sure what the old code was trying to do, but this is
much simpler, covers every case I can think of, and fixes some bugs.

File:

• editwin.c (modified) (1 diff)

editwin.c

@@ -1199 +1199 @@
 static int owl_editwin_check_dotsend(owl_editwin *e)
 {
-  char *p, *p_n, *p_p;
-  gunichar c;
+  int zdot;
+  oe_excursion x;
 
   if (!e->dotsend) return(0);
-
-  p = g_utf8_find_prev_char(e->buff, e->buff + e->bufflen);
-  p_n = g_utf8_find_next_char(p, NULL);
-  p_p = g_utf8_find_prev_char(e->buff, p);
-  c = g_utf8_get_char(p);
-  while (p != NULL) {
-    if (*p == '.'
-        && p_p != NULL && (*p_p == '\n' || *p_p == '\r')
-        && p_n != NULL && (*p_n == '\n' || *p_n == '\r')) {
-      e->bufflen = p - e->buff;
-      e->buff[e->bufflen] = '\0';
-      return(1);
-    }
-    if (c != '\0' && !g_unichar_isspace(c)) return(0);
-    p_n = p;
-    p = p_p;
-    c = g_utf8_get_char(p);
-    p_p = g_utf8_find_prev_char(e->buff, p);
-  }
-  return(0);
+  if (e->index != e->bufflen) return (0);
+
+  oe_save_excursion(e, &x);
+
+  owl_editwin_point_move(e, -3);
+
+  zdot = (strcmp(e->buff + e->index, "\n.\n") == 0);
+
+  oe_restore_excursion(e, &x);
+
+  return zdot;
 }