Removing stray spaces before tabs.

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

diff --git a/ChangeLog b/ChangeLog
index bacaf51367826bad313f494ae837cf2f3465edba..c7ec33236dab96ee99bb44ab669650e614acdc06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
        remove an obsolete comment, and remove some superfluous #ifndefs.
        * src/global.c (shortcut_init) - Put ^B and ^F in the same order as
        all other command keys: first the backward then the forward motion.
+       * src/{nano.h,*.c} - Remove stray spaces before tabs.
 
 2014-03-16  Benno Schulenberg  <bensberg@justemail.net>
        * src/nano.h - Display more help items when the terminal is wider.

diff --git a/src/browser.c b/src/browser.c
index 2876d9f98d4b77d537486406d7408f59cde9ee5e..28ff1843d15086d1495020fdccc914e9f4c163fb 100644 (file)
--- a/src/browser.c
+++ b/src/browser.c
@@ -1070,7 +1070,7 @@ char *striponedir(const char *path)
     tmp = strrchr(retval, '/');
 
     if (tmp != NULL)
-       null_at(&retval, tmp - retval);
+       null_at(&retval, tmp - retval);
 
     return retval;
 }

diff --git a/src/files.c b/src/files.c
index 9faa326213b11d6290b5b808502205331f8b3147..a7ac0a90e00b9ba1e5c27593ddb30545049afc6c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -937,7 +937,7 @@ int open_file(const char *filename, bool newfie, FILE **f)
        statusbar(_("Error reading %s: %s"), filename,
                strerror(errno));
        beep();
-       return -1;
+       return -1;
      } else {
        /* The file is A-OK.  Open it. */
        *f = fdopen(fd, "rb");

diff --git a/src/global.c b/src/global.c
index 6d01aba8d56595449e474a38ea6492880e1bb470..87297aff54a3dbf0a3dc87ed09a71dd754104bd2 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -604,7 +604,7 @@ void shortcut_init(bool unjustify)
 #ifdef ENABLE_MULTIBUFFER
        N_("Close the current file buffer / Exit from nano")
 #else
-       N_("Exit from nano")
+       N_("Exit from nano")
 #endif
        ;
     const char *nano_writeout_msg =
@@ -1177,7 +1177,7 @@ void shortcut_init(bool unjustify)
     add_to_sclist(MMAIN, "M-{", do_unindent, 0, TRUE);
     if (ISSET(UNDOABLE)) {
        add_to_sclist(MMAIN, "M-U", do_undo, 0, TRUE);
-       add_to_sclist(MMAIN, "M-E", do_redo, 0, TRUE);
+       add_to_sclist(MMAIN, "M-E", do_redo, 0, TRUE);
     }
 #endif
     add_to_sclist(MALL, "^F", do_right, 0, TRUE);

diff --git a/src/nano.c b/src/nano.c
index 8665c3c19cfe7cd022e4bc50763da643a83a042e..fc4a183996cb66937e4341ef73654bc46e9791f7 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1685,7 +1685,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 #endif
                                if (edit_refresh_needed) {
 #ifdef DEBUG
-                                   fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
+                                   fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
 #endif
                                    edit_refresh();
                                    edit_refresh_needed = FALSE;
@@ -1741,7 +1741,7 @@ int do_mouse(void)
            fprintf(stderr, "mouse_y = %d, current_y = %d\n", mouse_y, openfile->current_y);
 #endif
 
-       if (ISSET(SOFTWRAP)) {
+       if (ISSET(SOFTWRAP)) {
            int i = 0;
            for (openfile->current = openfile->edittop;
                 openfile->current->next && i < mouse_y;
@@ -1825,7 +1825,7 @@ void precalc_multicolorinfo(void)
           message before starting this later if it takes
           too long to do this routine.  For now silently
           abort if they hit a key */
-       nodelay(edit, FALSE);
+       nodelay(edit, FALSE);
 
        for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
 
@@ -1851,7 +1851,7 @@ void precalc_multicolorinfo(void)
                if ((cur_check = time(NULL)) - last_check > 1) {
                    last_check = cur_check;
                    if (wgetch(edit) != ERR)
-                       goto precalc_cleanup;
+                       goto precalc_cleanup;
                }
 
                while ((nostart = regexec(tmpcolor->start, &fileptr->data[startx], 1, &startmatch, 0))  == 0) {
@@ -1882,7 +1882,7 @@ void precalc_multicolorinfo(void)
                        if ((cur_check = time(NULL)) - last_check > 1) {
                            last_check = cur_check;
                            if (wgetch(edit) != ERR)
-                               goto precalc_cleanup;
+                               goto precalc_cleanup;
                        }
                        if (regexec(tmpcolor->end, endptr->data, 1, &endmatch, 0) == 0)
                           break;
@@ -1890,7 +1890,7 @@ void precalc_multicolorinfo(void)
 
                    if (endptr == NULL) {
 #ifdef DEBUG
-                       fprintf(stderr, "no end found, breaking out\n");
+                       fprintf(stderr, "no end found, breaking out\n");
 #endif
                        break;
                    }

diff --git a/src/nano.h b/src/nano.h
index 06d0cf668a00e6287b2a92bbd2d3787f8fd32faa..adb80bcd2a4976809e5efc4f25b831abec94b4fa 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -262,15 +262,15 @@ typedef struct lintstruct {
 } lintstruct;
 
 
-#define CNONE          (1<<1)
+#define CNONE          (1<<1)
        /* Yay, regex doesn't apply to this line at all! */
-#define CBEGINBEFORE   (1<<2)
+#define CBEGINBEFORE   (1<<2)
        /* regex starts on an earlier line, ends on this one */
-#define CENDAFTER      (1<<3)
+#define CENDAFTER      (1<<3)
        /* regex sraers on this line and ends on a later one */
-#define CWHOLELINE     (1<<4)
+#define CWHOLELINE     (1<<4)
        /* whole line engulfed by the regex  start < me, end > me */
-#define CSTARTENDHERE  (1<<5)
+#define CSTARTENDHERE  (1<<5)
        /* regex starts and ends within this line */
 #define CWTF           (1<<6)
        /* Something else */

diff --git a/src/prompt.c b/src/prompt.c
index 082edf2046e7215dcdf6db4c0d9d1c810e6bdafd..af6f3c7065ca2bce6ab7585af1816b99b889db37 100644 (file)
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -186,7 +186,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
            else if (s->scfunc == do_verbatim_input) {
                    /* If we're using restricted mode, the filename
                     * isn't blank, and we're at the "Write File"
-                    * prompt, disable verbatim input. */
+                    * prompt, disable verbatim input. */
                    if (!ISSET(RESTRICTED) ||
                        openfile->filename[0] == '\0' ||
                        currmenu != MWRITEFILE) {

diff --git a/src/rcfile.c b/src/rcfile.c
index ddd05f1b45ec414c1a5b3c78dc80436e0a2d7397..29b0b297a2e2ced9c917fa6724800b03046877bd 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1098,7 +1098,7 @@ void parse_rcfile(FILE *rcstream
            parse_syntax(ptr);
        }
        else if (strcasecmp(keyword, "magic") == 0) {
-           parse_magictype(ptr);
+           parse_magictype(ptr);
        } else if (strcasecmp(keyword, "header") == 0)
            parse_headers(ptr);
        else if (strcasecmp(keyword, "color") == 0)

diff --git a/src/search.c b/src/search.c
index a05de7e0c05d06b9bb80f9f1bdd023b5d7a58509..b29c7d33090bebd6d48da849682357f54ab6f0a6 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -224,7 +224,7 @@ int search_init(bool replacing, bool use_answer)
        for  (s = sclist; s != NULL; s = s->next)
            if ((s->menu & currmenu) && i == s->seq) {
                func = s->scfunc;
-               break;
+               break;
            }
 
        if (i == -2 || i == 0 ) {

diff --git a/src/text.c b/src/text.c
index 57e619c24e2b53008db49fef0594ae6a13d8206f..f7623ef8342a569ebbfbb3ec87dde86e72732cf7 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -418,7 +418,7 @@ void redo_cut(undo *u) {
            t = t->next;
         }
        openfile->mark_begin = t;
-       openfile->mark_begin_x = 0;
+       openfile->mark_begin_x = 0;
        openfile->mark_set = TRUE;
     }
 
@@ -3073,7 +3073,7 @@ void do_linter(void)
     /* Get the system pipe buffer size. */
     if ((pipe_buff_size = fpathconf(lint_fd[0], _PC_PIPE_BUF)) < 1) {
        close(lint_fd[0]);
-       statusbar(_("Could not get size of pipe buffer"));
+       statusbar(_("Could not get size of pipe buffer"));
        return;
     }
 

diff --git a/src/winio.c b/src/winio.c
index d2544bcfb31d724cc8851ebed12edf9f3ffd9045..c33af652eec0d810916acad5571f0f059bba0503 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2507,7 +2507,7 @@ void edit_draw(filestruct *fileptr, const char *converted, int
        /* Set up multi-line color data for this line if it's not yet calculated  */
         if (fileptr->multidata == NULL && openfile->syntax
                && openfile->syntax->nmultis > 0) {
-           int i;
+           int i;
            fileptr->multidata = (short *) nmalloc(openfile->syntax->nmultis * sizeof(short));
             for (i = 0; i < openfile->syntax->nmultis; i++)
                fileptr->multidata[i] = -1;     /* Assue this applies until we know otherwise */