[Qemacs-commit] qemacs buffer.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/01/10 01:17:15

Modified files:
        .              : buffer.c 

Log message:
        small fixes in buffer APIs
        
        * fix bug in eb_delete_chars
        * pass len=-1 for zero terminated strings in eb_insert_utf8_buf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.53&r2=1.54

Patches:
Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- buffer.c    8 Jan 2014 16:26:44 -0000       1.53
+++ buffer.c    10 Jan 2014 01:17:14 -0000      1.54
@@ -957,9 +957,9 @@
 
 int eb_delete_chars(EditBuffer *b, int offset, int n)
 {
-    int offset1 = eb_skip_chars(b, offset, n);
-    eb_delete(b, offset, offset1);
-    return offset1 - offset;
+    int size = eb_skip_chars(b, offset, n) -  offset;
+    eb_delete(b, offset, size);
+    return size;
 }
 
 /* XXX: only stateless charsets are supported */
@@ -1469,6 +1469,9 @@
 /* Insert buffer with utf8 chars according to buffer encoding */
 int eb_insert_utf8_buf(EditBuffer *b, int offset, const char *buf, int len)
 {
+    if (len < 0)
+        len = strlen(buf);
+
     if (b->charset == &charset_utf8) {
         eb_insert(b, offset, buf, len);
         return len;