fixed bad memory access in view code and fixed the default background color

diff --git a/lib/view.c b/lib/view.c
index 61761e88310eb6cf3cbe59b22555135734df0007..87b138937ed99d2fa2d7026aede4e801243759e8 100644 (file)
--- a/lib/view.c
+++ b/lib/view.c
@@ -173,8 +173,9 @@ void view_update(View* view, size_t* csrx, size_t* csry) {
             view_scroll(view, UP * (view->nvisible/2));
         } else {
             Row* lastrow = view->rows[view->nrows-1];
+            size_t last_off = lastrow->cols[lastrow->len-1].off;
             view_scrollto(view, CSRPOS);
-            if (lastrow->cols[lastrow->len-1].off < CSRPOS)
+            if (last_off < CSRPOS)
                 view_scroll(view, UP * (view->nvisible-1));
         }
         view->sync_flags = 0;

diff --git a/lib/x11.c b/lib/x11.c
index b0a2b7bff66d3ef1f5960d1be990e27681f58d83..be9057ea6974cef3163dbd510b1dcb9697a5d31e 100644 (file)
--- a/lib/x11.c
+++ b/lib/x11.c
@@ -122,7 +122,7 @@ static void x11_window(char* name) {
         X.width,
         X.height,
         0, X.depth,
-        Palette[0]);
+        Palette[EditBg]);
     /* register interest in the delete window message */
     Atom wmDeleteMessage = XInternAtom(X.display, "WM_DELETE_WINDOW", False);
     XSetWMProtocols(X.display, X.self, &wmDeleteMessage, 1);