nano

commit 83a841cd06ac09f49b835ec752da73d137800cbd
parent 0af5788a945bddc428b31a15f27fcb9d9a5c60e5
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Wed,  1 Mar 2017 13:56:08 +0100

tweaks: chuck some debugging stuff and some useless asserts

Diffstat:
M
src/move.c
 | 
26
++------------------------

1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/src/move.c b/src/move.c
@@ -75,13 +75,8 @@ void do_page_up(void)
     for (i = mustmove; i - skipped > 0 && openfile->current != openfile->fileage; i--) {
 	openfile->current = openfile->current->prev;
 #ifndef NANO_TINY
-	if (ISSET(SOFTWRAP) && openfile->current) {
+	if (ISSET(SOFTWRAP) && openfile->current)
 	    skipped += strlenpt(openfile->current->data) / editwincols;
-#ifdef DEBUG
-	    fprintf(stderr, "paging up: i = %d, skipped = %d based on line %ld len %lu\n",
-			i, skipped, (long)openfile->current->lineno, (unsigned long)strlenpt(openfile->current->data));
-#endif
-	}
 #endif
     }
 
@@ -114,13 +109,8 @@ void do_page_down(void)
 
     mustmove = (maxlines < 3) ? 1 : maxlines - 2;
 
-    for (i = mustmove; i > 0 && openfile->current != openfile->filebot; i--) {
+    for (i = mustmove; i > 0 && openfile->current != openfile->filebot; i--)
 	openfile->current = openfile->current->next;
-#ifdef DEBUG
-	fprintf(stderr, "paging down: moving to line %lu\n", (unsigned long)openfile->current->lineno);
-#endif
-
-    }
 
     openfile->current_x = actual_x(openfile->current->data,
 					openfile->placewewant);
@@ -244,8 +234,6 @@ void do_prev_word(bool allow_punct, bool allow_update)
     filestruct *was_current = openfile->current;
     bool seen_a_word = FALSE, step_forward = FALSE;
 
-    assert(openfile->current != NULL && openfile->current->data != NULL);
-
     /* Move backward until we pass over the start of a word. */
     while (TRUE) {
 	/* If at the head of a line, move to the end of the preceding one. */
@@ -303,8 +291,6 @@ bool do_next_word(bool allow_punct, bool allow_update)
 				openfile->current_x, allow_punct);
     bool seen_space = !started_on_word;
 
-    assert(openfile->current != NULL && openfile->current->data != NULL);
-
     /* Move forward until we reach the start of a word. */
     while (TRUE) {
 	/* If at the end of a line, move to the beginning of the next one. */
@@ -413,8 +399,6 @@ void do_up(bool scroll_only)
 		(scroll_only && openfile->edittop == openfile->fileage))
 	return;
 
-    assert(ISSET(SOFTWRAP) || openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
-
     /* Move the current line of the edit window up. */
     openfile->current = openfile->current->prev;
     openfile->current_x = actual_x(openfile->current->data,
@@ -458,10 +442,6 @@ void do_down(bool scroll_only)
     if (openfile->current == openfile->filebot)
 	return;
 
-    assert(ISSET(SOFTWRAP) || openfile->current_y ==
-		openfile->current->lineno - openfile->edittop->lineno);
-    assert(openfile->current->next != NULL);
-
 #ifndef NANO_TINY
     if (ISSET(SOFTWRAP)) {
 	/* Compute the number of lines to scroll. */
@@ -564,8 +544,6 @@ void do_right(void)
 {
     size_t was_column = xplustabs();
 
-    assert(openfile->current_x <= strlen(openfile->current->data));
-
     if (openfile->current->data[openfile->current_x] != '\0')
 	openfile->current_x = move_mbright(openfile->current->data,
 						openfile->current_x);