added logic to extend previous undo log entries

diff --git a/inc/stdc.h b/inc/stdc.h
index e70805c24a479b4d615b0ca458599497b3ca0227..5ff68d613ffbfc5c1f8b165f6fd175c6022fb76e 100644 (file)
--- a/inc/stdc.h
+++ b/inc/stdc.h
@@ -19,28 +19,25 @@
 #include <stdarg.h>
 #include <string.h>
 
-/* Type Definitions
- *****************************************************************************/
-typedef unsigned short ushort;
-typedef unsigned char uchar;
-typedef unsigned long ulong;
-typedef unsigned int uint;
-typedef signed char schar;
-typedef long long vlong;
-typedef unsigned long long uvlong;
-
-typedef uint8_t  uint8;
-typedef uint16_t uint16;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-
-typedef int8_t  int8;
-typedef int16_t int16;
-typedef int32_t int32;
-typedef int64_t int64;
-
-typedef uintptr_t uintptr;
-typedef intptr_t  intptr;
+static char* strmcat(char* first, ...) {
+    va_list args;
+    /* calculate the length of the final string */
+    size_t len = strlen(first);
+    va_start(args, first);
+    for (char* s = NULL; (s = va_arg(args, char*));)
+        len += strlen(s);
+    va_end(args);
+    /* allocate the final string and copy the args into it */
+    char *str  = malloc(len+1), *curr = str;
+    while (first && *first) *(curr++) = *(first++);
+    va_start(args, first);
+    for (char* s = NULL; (s = va_arg(args, char*));)
+        while (s && *s) *(curr++) = *(s++);
+    va_end(args);
+    /* null terminate and return */
+    *curr = '\0';
+    return str;
+}
 
 /* Option Parsing
  *

diff --git a/lib/buf.c b/lib/buf.c
index 8c05e3035259a13da83e7c6f15bd71536c7d5e83..b4c61bcb1f77b68c66a4ad1d57306ec10441f37b 100644 (file)
--- a/lib/buf.c
+++ b/lib/buf.c
@@ -153,6 +153,32 @@ static Log* mklog(size_t beg, size_t end, char* data, Log* next) {
     return log;
 }
 
+static void log_add(size_t beg, size_t end, char* data, Log** logstk) {
+    Log* prev = *logstk;
+    /* decide if this is an insert or delete */
+    if (!data) {
+        if (prev && !prev->data && prev->end == beg)
+            prev->end++;
+        else
+            *logstk = mklog(beg, end, data, prev);
+    } else {
+        if (prev && prev->data && prev->beg == beg) {
+            char* newdata = strmcat(prev->data, data, 0);
+            free(data);
+            free(prev->data);
+            prev->data = newdata;
+        } else if (prev && prev->data && prev->beg == beg+1) {
+            char* newdata = strmcat(data, prev->data, 0);
+            free(data);
+            free(prev->data);
+            prev->data = newdata;
+            prev->end = --prev->beg;
+        } else {
+            *logstk = mklog(beg, end, data, prev);
+        }
+    }
+}
+
 static void log_clear(Log** list) {
     while (*list) {
         Log* deadite = *list;
@@ -247,7 +273,7 @@ void buf_puts(Buf* buf, char* s) {
     size_t beg = buf_getsel(buf).beg;
     if (s && *s) {
         while (*s) putb(buf, *(s++), &(buf->selection));
-        buf->undo = mklog(beg, buf_getsel(buf).end, NULL, buf->undo);
+        log_add(beg, buf_getsel(buf).end, NULL, &(buf->undo));
     }
 }
 
@@ -275,7 +301,7 @@ void buf_del(Buf* buf) {
         buf->gapend += nbytes;
         sel.end = sel.beg;
         buf->selection = sel;
-        buf->undo = mklog(sel.beg, sel.end, str, buf->undo);
+        log_add(sel.beg, sel.end, str, &(buf->undo));
     }
 }
 

diff --git a/tide.c b/tide.c
index 23ac485b831759991544ca04e7166ea9af72fcd9..b894eb6257b95f1c6fc8296c5b185f71eb966ca8 100644 (file)
--- a/tide.c
+++ b/tide.c
@@ -78,26 +78,6 @@ static void cmd_exec(char* cmd) {
         job_start(execcmd, input, len, (op != '<' ? curr : edit));
 }
 
-static char* strmcat(char* first, ...) {
-    va_list args;
-    /* calculate the length of the final string */
-    size_t len = strlen(first);
-    va_start(args, first);
-    for (char* s = NULL; (s = va_arg(args, char*));)
-        len += strlen(s);
-    va_end(args);
-    /* allocate the final string and copy the args into it */
-    char *str  = malloc(len+1), *curr = str;
-    while (first && *first) *(curr++) = *(first++);
-    va_start(args, first);
-    for (char* s = NULL; (s = va_arg(args, char*));)
-        while (s && *s) *(curr++) = *(s++);
-    va_end(args);
-    /* null terminate and return */
-    *curr = '\0';
-    return str;
-}
-
 static void cmd_execwitharg(char* cmd, char* arg) {
     cmd = (arg ? strmcat(cmd, " '", arg, "'", 0) : strmcat(cmd));
     cmd_exec(cmd);