backoutmerge

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 3e912d5..e1c4080 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -186,7 +186,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
                        return FALSE;
                }
        }
-        else if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
+       if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
                switch(ev->keyval) {
                case GDK_r:
                case GDK_R:
@@ -211,16 +211,6 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
                        return TRUE;
                }
        }
-        else {
-                switch(ev->keyval) {
-                case GDK_k:
-                        webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, -1);
-                        return TRUE;
-                case GDK_j:
-                        webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, 1);
-                        return TRUE;
-                }
-        }
        return FALSE;
 }