[Qemacs-commit] qemacs qe.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        15/09/16 21:45:27

Modified files:
        .              : qe.c 

Log message:
        fix cpp compilation: fix enum values and types

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.215&r2=1.216

Patches:
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -b -r1.215 -r1.216
--- qe.c        16 Sep 2015 21:42:18 -0000      1.215
+++ qe.c        16 Sep 2015 21:45:27 -0000      1.216
@@ -1470,7 +1470,7 @@
 
         /* break sequence of insertions */
         if (key == '\n' || (key != ' ' && s->b->last_log_char == ' ')) {
-            s->b->last_log = 0;
+            s->b->last_log = LOGOP_FREE;
         }
         s->b->last_log_char = key;
 
@@ -1802,7 +1802,7 @@
     if (b) {
         size = b->total_size;
         if (size > 0) {
-            s->b->last_log = 0;
+            s->b->last_log = LOGOP_FREE;
             s->offset += eb_insert_buffer_convert(s->b, s->offset, b, 0, size);
         }
     }
@@ -6548,12 +6548,14 @@
                      eb_write_buffer(s->b, s->b->mark, s->offset, filename));
 }
 
-typedef struct QuitState {
-    enum {
+enum QSState {
         QS_ASK,
         QS_NOSAVE,
         QS_SAVE,
-    } state;
+};
+
+typedef struct QuitState {
+    enum QSState state;
     int modified;
     EditBuffer *b;
 } QuitState;
@@ -7043,7 +7045,7 @@
     s = edit_new(b1, x1, y1, x2 - x1, y2 - y1, flags);
     if (m)
         edit_set_mode(s, m);
-    s->wrap = wrap;
+    s->wrap = (enum WrapType)wrap;
     s->offset = clamp(eb_goto_pos(b1, args[6], args[7]), 0, b1->total_size);
     s->b->mark = clamp(eb_goto_pos(b1, args[8], args[9]), 0, b1->total_size);
     s->offset_top = clamp(eb_goto_pos(b1, args[10], args[11]), 0, 
b1->total_size);