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

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/01/31 14:50:14

Modified files:
        .              : buffer.c extras.c qe.c 

Log message:
        cosmetic changes
        
        * report lack of undo information in do_undo and do_redo
        * make region command remove region highlight

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/qemacs/extras.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.138&r2=1.139

Patches:
Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- buffer.c    31 Jan 2014 12:14:13 -0000      1.68
+++ buffer.c    31 Jan 2014 14:50:13 -0000      1.69
@@ -939,8 +939,13 @@
     int log_index, size_trailer;
     LogBuffer lb;
 
-    if (!b->log_buffer)
+    if (!b->log_buffer) {
+        put_status(s, "No undo information");
         return;
+    }
+
+    /* deactivate region hilite */
+    s->region_style = 0;
 
     /* Should actually keep undo state current until new logs are added */
     if (s->qe_state->last_cmd_func != (CmdFunc)do_undo
@@ -1011,8 +1016,13 @@
     int log_index, size_trailer;
     LogBuffer lb;
 
-    if (!b->log_buffer)
+    if (!b->log_buffer) {
+        put_status(s, "No undo information");
         return;
+    }
+
+    /* deactivate region hilite */
+    s->region_style = 0;
 
     /* Should actually keep undo state current until new logs are added */
     if (s->qe_state->last_cmd_func != (CmdFunc)do_undo

Index: extras.c
===================================================================
RCS file: /sources/qemacs/qemacs/extras.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- extras.c    23 Jan 2014 12:56:22 -0000      1.17
+++ extras.c    31 Jan 2014 14:50:13 -0000      1.18
@@ -406,12 +406,14 @@
         EditBuffer *b1 = eb_new("*tmp*", BF_SYSTEM | (b->flags & BF_STYLES));
 
         eb_set_charset(b1, b->charset);
+        /* Use eb_insert_buffer_convert to copy styles.
+         * This conversion should not change sizes */
         eb_insert_buffer_convert(b1, 0, b, offset2, size2);
         eb_insert_buffer_convert(b1, size2, b, offset1, size1);
         eb_insert_buffer_convert(b1, size2 + size1, b, offset0, size0);
         /* XXX: This will create 2 undo records */
         eb_delete(b, offset0, size0 + size1 + size2);
-        eb_insert_buffer_convert(b, offset0, b1, 0, size0 + size1 + size2);
+        eb_insert_buffer_convert(b, offset0, b1, 0, b1->total_size);
         eb_free(&b1);
     }
     s->offset = end_offset;

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- qe.c        31 Jan 2014 12:14:13 -0000      1.138
+++ qe.c        31 Jan 2014 14:50:13 -0000      1.139
@@ -708,6 +708,9 @@
 {
     int offset;
 
+    /* deactivate region hilite */
+    s->region_style = 0;
+
     /* WARNING: during case change, the region offsets can change, so
        it is not so simple ! */
     offset = min(s->offset, s->b->mark);
@@ -5792,6 +5795,9 @@
 {
     char absname[MAX_FILENAME_SIZE];
 
+    /* deactivate region hilite */
+    s->region_style = 0;
+
     canonicalize_absolute_path(absname, sizeof(absname), filename);
     put_save_message(s, filename,
                      eb_write_buffer(s->b, s->b->mark, s->offset, filename));