[Qemacs-commit] qemacs qe.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/03/03 23:52:51

Modified files:
        .              : qe.c 

Log message:
        fix cursor not found bug upon some mode changes

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

Patches:
Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- qe.c        3 Mar 2014 23:35:46 -0000       1.152
+++ qe.c        3 Mar 2014 23:52:50 -0000       1.153
@@ -7347,8 +7347,6 @@
 
 int text_mode_init(EditState *s, ModeSavedData *saved_data)
 {
-    eb_add_callback(s->b, eb_offset_callback, &s->offset, 0);
-    eb_add_callback(s->b, eb_offset_callback, &s->offset_top, 0);
     if (saved_data) {
         memcpy(s, saved_data->generic_data, SAVED_DATA_SIZE);
     } else {
@@ -7358,8 +7356,12 @@
         s->default_style = QE_STYLE_DEFAULT;
         s->wrap = WRAP_LINE;
     }
+    s->offset = min(s->offset, s->b->total_size);
+    s->offset_top = min(s->offset_top, s->b->total_size);
     s->hex_mode = 0;
     s->insert = 1;
+    eb_add_callback(s->b, eb_offset_callback, &s->offset, 0);
+    eb_add_callback(s->b, eb_offset_callback, &s->offset_top, 0);
     set_colorize_func(s, NULL);
     return 0;
 }