Removing a few more doubled-up spaces.

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

diff --git a/ChangeLog b/ChangeLog
index 5f2d00cefed2ed205f61d4e8069fb8f725a56919..b6484efb4954fdd02c011af29b42f822b671caa9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-05-16  Benno Schulenberg  <bensberg@justemail.net>
+       * src/text.c, src/winio.c: Remove some more double spaces.
+
 2014-05-16  David Lawrence Ramsey  <pooka109@gmail.com>
        * src/color.c, src/cut.c, src/text.c: Tweak some whitespace.
        * src/global.c, src/move.c: Use TRUE and FALSE instead of 1 and 0.

diff --git a/src/text.c b/src/text.c
index 8d9432e68eee209eb6855a6885e9f2de108cb816..662b3fd9819ee749b4d990899f8cbb5c2219b2a0 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -868,10 +868,10 @@ void add_undo(undo_type current_action)
     u->strdata = NULL;
     u->strdata2 = NULL;
     u->cutbuffer = NULL;
-    u->cutbottom  = NULL;
+    u->cutbottom = NULL;
     u->mark_set = 0;
     u->mark_begin_lineno = fs->current->lineno;
-    u->mark_begin_x =  fs->current_x;
+    u->mark_begin_x = fs->current_x;
     u->xflags = 0;
     u->to_end = FALSE;
 
@@ -940,8 +940,8 @@ void add_undo(undo_type current_action)
                free(u->cutbuffer);
            u->cutbuffer = copy_filestruct(cutbuffer);
            u->mark_begin_lineno = fs->current->lineno;
-           u->mark_begin_x =  fs->current_x;
-           u->lineno =  fs->current->lineno + cutbottom->lineno - cutbuffer->lineno;
+           u->mark_begin_x = fs->current_x;
+           u->lineno = fs->current->lineno + cutbottom->lineno - cutbuffer->lineno;
 
            filestruct *fs_buff = cutbuffer;
            if (fs_buff->lineno == cutbottom->lineno)
@@ -951,7 +951,7 @@ void add_undo(undo_type current_action)
                while (fs_buff->lineno != cutbottom->lineno && fs_buff->next != NULL)
                    fs_buff = fs_buff->next;
                assert(fs_buff->next != NULL);
-               u->begin = get_totsize(fs_buff,cutbottom);
+               u->begin = get_totsize(fs_buff, cutbottom);
            }
 
            u->mark_set = TRUE;
@@ -1022,7 +1022,7 @@ void update_undo(undo_type action)
        fprintf(stderr, "current undo data now \"%s\"\n", u->strdata);
 #endif
        u->mark_begin_lineno = fs->current->lineno;
-       u->mark_begin_x =  fs->current_x;
+       u->mark_begin_x = fs->current_x;
        break;
     case DEL:
        len = strlen(u->strdata) + 2;
@@ -3181,7 +3181,7 @@ void do_linter(void)
                                continue;
                            }
 
-                           tmpcolno =  strtol(maybecol, &convendptr, 10);
+                           tmpcolno = strtol(maybecol, &convendptr, 10);
                            if (*convendptr != '\0') {
                                /* Previous field might still be
                                 * line,col format. */

diff --git a/src/winio.c b/src/winio.c
index d8dfaef2a489e1209d7e0deb344b797690f84a2f..45d327083777fc72b75d899138feed23a29e00ed 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -123,7 +123,7 @@ void get_key_buffer(WINDOW *win)
     /* Read in the first character using whatever mode we're in. */
     errcount = 0;
     if (nodelay_mode) {
-       if ((input =  wgetch(win)) == ERR)
+       if ((input = wgetch(win)) == ERR)
            return;
     } else
        while ((input = wgetch(win)) == ERR) {
@@ -612,7 +612,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 #ifdef KEY_SUSPEND
            /* Slang doesn't support KEY_SUSPEND. */
            case KEY_SUSPEND:
-               retval =  sc_seq_or(do_suspend_void, 0);
+               retval = sc_seq_or(do_suspend_void, 0);
                break;
 #endif
 #ifdef PDCURSES
@@ -3015,7 +3015,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
        /* Don't over-scroll on long lines. */
        if (ISSET(SOFTWRAP) && (direction == UP_DIR)) {
            ssize_t len = strlenpt(openfile->edittop->data) / COLS;
-           i -=  len;
+           i -= len;
            if (len > 0)
                do_redraw = TRUE;
        }