Oops, remove debugging crap and don't be so conservative in space/tab check loop

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@560 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/nano.c b/nano.c
index 6a7c82a2a36aa375e17042a19a9443bdbb917a0b..e405679fe2cf32674f46db0750541d8367778d71 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -768,7 +768,6 @@ void do_wrap(filestruct * inptr, char input_char)
 
     /* Category 1a: one word taking up the whole line with no beginning spaces. */
     if ((last_word_end == -1) && (!isspace((int) inptr->data[0]))) {
-fprintf(stderr, "1a\n");
        for (i = current_word_end; i < len; i++) {
            if (!isspace((int) inptr->data[i]) && i < len) {
                current_word_start = i;
@@ -809,8 +808,7 @@ fprintf(stderr, "1a\n");
            if (ISSET(AUTOINDENT)) {
                int i = 0;
                while ((inptr->next->data[i] == ' ' 
-                       || inptr->next->data[i] == '\t')
-                       && inptr->next->data[i] != 0) {
+                       || inptr->next->data[i] == '\t')) {
                    i++;
                    right++;
                }                       
@@ -828,7 +826,6 @@ fprintf(stderr, "1a\n");
 
     /* Category 2: two or more words on the line. */
     else {
-fprintf(stderr, "2a\n");
        /* Case 2a: cursor before word at wrap point. */
        if (current_x < current_word_start) {
            temp->data =
@@ -864,8 +861,7 @@ fprintf(stderr, "2a\n");
            if (ISSET(AUTOINDENT)) {
                int i = 0;
                while ((inptr->next->data[i] == ' ' 
-                       || inptr->next->data[i] == '\t')
-                       && inptr->next->data[i] != 0) {
+                       || inptr->next->data[i] == '\t')) {
                    i++;
                    right++;
                }                       
@@ -891,7 +887,6 @@ fprintf(stderr, "2a\n");
 
        /* Case 2c: cursor past word at wrap point. */
        else {
-fprintf(stderr, "2c\n");
            temp->data =
                nmalloc(strlen(&inptr->data[current_word_start]) + 1);
            strcpy(temp->data, &inptr->data[current_word_start]);