[Qemacs-commit] qemacs buffer.c qe.c qe.h

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/01/16 15:18:44

Modified files:
        .              : buffer.c qe.c qe.h 

Log message:
        make new buffers use utf8 charset by default
        
        * added BF_RAW flag for undo and styles buffers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.124&r2=1.125

Patches:
Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- buffer.c    16 Jan 2014 13:45:04 -0000      1.61
+++ buffer.c    16 Jan 2014 15:18:44 -0000      1.62
@@ -520,12 +520,10 @@
 {
     EditBuffer *b;
 
-    b = eb_find(name);
-    if (b != NULL) {
+    b = eb_find_new(name, flags);
+    if (b != NULL)
         eb_clear(b);
-    } else {
-        b = eb_new(name, flags);
-    }
+
     return b;
 }
 
@@ -764,7 +762,7 @@
     if (b->b_styles) {
         return 0;
     } else {
-        b->b_styles = eb_new("*", BF_SYSTEM);
+        b->b_styles = eb_new("*", BF_SYSTEM | BF_RAW);
         b->flags |= flags & BF_STYLES;
         b->style_shift = ((flags & BF_STYLES) / BF_STYLE1) - 1;
         b->style_bytes = 1 << b->style_shift;
@@ -870,7 +868,7 @@
          * referenced by name.
          */
         snprintf(buf, sizeof(buf), "*log <%s>*", b->name);
-        b->log_buffer = eb_new(buf, BF_SYSTEM);
+        b->log_buffer = eb_new(buf, BF_SYSTEM | BF_RAW);
         if (!b->log_buffer)
             return;
     }

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- qe.c        16 Jan 2014 14:28:28 -0000      1.126
+++ qe.c        16 Jan 2014 15:18:44 -0000      1.127
@@ -1456,7 +1456,7 @@
         }
     }
     snprintf(bufname, sizeof(bufname), "*kill-%d*", qs->yank_current + 1);
-    b = eb_new(bufname, base->flags & (BF_STYLES | BF_UTF8));
+    b = eb_new(bufname, base->flags & BF_STYLES);
     eb_set_charset(b, base->charset);
     qs->yank_buffers[qs->yank_current] = b;
     return b;
@@ -5376,7 +5376,8 @@
 {
     EditBuffer *b;
 
-    b = eb_find_new(bufname, BF_SAVELOG);
+    /* XXX: Default buffer charset should be selectable */
+    b = eb_find_new(bufname, BF_SAVELOG | BF_UTF8);
     if (b)
         switch_to_buffer(s, b);
 }
@@ -5583,6 +5584,8 @@
 
     /* First we try to read the first block to determine the data type */
     if (stat(filename, &st) < 0) {
+        /* XXX: default charset should be selectable.  Use utf8 for now */
+        eb_set_charset(b, &charset_utf8);
         /* CG: should check for wildcards and do dired */
         //if (strchr(filename, '*') || strchr(filename, '?'))
         //    goto dired;

Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- qe.h        16 Jan 2014 14:28:28 -0000      1.124
+++ qe.h        16 Jan 2014 15:18:44 -0000      1.125
@@ -727,7 +727,7 @@
 #define BF_SAVING    0x0020  /* buffer is being saved */
 #define BF_DIRED     0x0100  /* buffer is interactive dired */
 #define BF_UTF8      0x0200  /* buffer charset is utf-8 */
-#define BF_RAW       0x0400  /* buffer charset is raw (same as latin1) */
+#define BF_RAW       0x0400  /* buffer charset is raw (no charset translation) 
*/
 #define BF_TRANSIENT 0x0800  /* buffer is deleted upon window close */
 #define BF_STYLES    0x3000  /* buffer has styles */
 #define BF_STYLE1    0x1000  /* buffer has 1 byte styles */