Rewrapping and reshuffling some lines.

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

diff --git a/ChangeLog b/ChangeLog
index bd55f28afa8b9f07b0ba5dc2c7f6d353d110a7ac..ca3ff4cff3aee536b887c064245fe1ef154537f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
        backwardly marked region.  This fixes Savannah bug #46980.
        * src/text.c (do_undo, do_redo): Center the cursor when the
        thing being undone or redone is currently off the screen.
+       * src/{files,nano,winio}.c: Rewrap and reshuffle some lines.
 
 2016-02-22  Chris Allegretta <chrisa@asty.org>
        * Add ability to kill the trailing spaces when justifying

diff --git a/src/files.c b/src/files.c
index ad434c60e736d3d40e6e0e5d8a76729932716a8a..b5a177f0e4313911b40b52e1dbe30b3fac0a6f1c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2550,8 +2550,8 @@ char *real_dir_from_tilde(const char *buf)
 
            do {
                userdata = getpwent();
-           } while (userdata != NULL && strcmp(userdata->pw_name,
-               tilde_dir + 1) != 0);
+           } while (userdata != NULL &&
+                       strcmp(userdata->pw_name, tilde_dir + 1) != 0);
            endpwent();
            if (userdata != NULL)
                tilde_dir = mallocstrcpy(tilde_dir, userdata->pw_dir);
@@ -2599,6 +2599,7 @@ void free_chararray(char **array, size_t len)
 
     for (; len > 0; len--)
        free(array[len - 1]);
+
     free(array);
 }
 #endif
@@ -2665,9 +2666,8 @@ char **username_tab_completion(const char *buf, size_t *num_matches,
 #endif
 
            matches = (char **)nrealloc(matches, (*num_matches + 1) *
-               sizeof(char *));
-           matches[*num_matches] =
-               charalloc(strlen(userdata->pw_name) + 2);
+                                       sizeof(char *));
+           matches[*num_matches] = charalloc(strlen(userdata->pw_name) + 2);
            sprintf(matches[*num_matches], "~%s", userdata->pw_name);
            ++(*num_matches);
        }
@@ -2693,8 +2693,7 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
     *num_matches = 0;
     null_at(&dirname, buf_len);
 
-    /* Okie, if there's a / in the buffer, strip out the directory
-     * part. */
+    /* Okie, if there's a / in the buffer, strip out the directory part. */
     filename = strrchr(dirname, '/');
     if (filename != NULL) {
        char *tmpdirname = filename + 1;
@@ -2736,8 +2735,7 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
            /* Cool, found a match.  Add it to the list.  This makes a
             * lot more sense to me (Chris) this way... */
 
-           char *tmp = charalloc(strlen(dirname) +
-               strlen(nextdir->d_name) + 1);
+           char *tmp = charalloc(strlen(dirname) + strlen(nextdir->d_name) + 1);
            sprintf(tmp, "%s%s", dirname, nextdir->d_name);
 
 #ifndef DISABLE_OPERATINGDIR
@@ -2758,7 +2756,7 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
                continue;
 
            matches = (char **)nrealloc(matches, (*num_matches + 1) *
-               sizeof(char *));
+                                       sizeof(char *));
            matches[*num_matches] = mallocstrcpy(NULL, nextdir->d_name);
            ++(*num_matches);
        }
@@ -2791,8 +2789,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
        const char *bob = strchr(buf, '/');
 
        if (bob == NULL || bob >= buf + *place)
-           matches = username_tab_completion(buf, &num_matches,
-               *place);
+           matches = username_tab_completion(buf, &num_matches, *place);
     }
 
     /* Match against files relative to the current working directory. */
@@ -2807,8 +2804,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
        size_t match, common_len = 0;
        char *mzero;
        const char *lastslash = revstrstr(buf, "/", buf + *place);
-       size_t lastslash_len = (lastslash == NULL) ? 0 :
-               lastslash - buf + 1;
+       size_t lastslash_len = (lastslash == NULL) ? 0 : lastslash - buf + 1;
        char *match1_mb = charalloc(mb_cur_max() + 1);
        char *match2_mb = charalloc(mb_cur_max() + 1);
        int match1_mb_len, match2_mb_len;
@@ -2858,8 +2854,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
        /* If the matches have something in common, show that part. */
        if (common_len != *place) {
            buf = charealloc(buf, common_len + buf_len - *place + 1);
-           charmove(buf + common_len, buf + *place, buf_len -
-               *place + 1);
+           charmove(buf + common_len, buf + *place, buf_len - *place + 1);
            strncpy(buf, mzero, common_len);
            *place = common_len;
        }
@@ -2915,8 +2910,7 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
                    break;
                }
 
-               disp = display_string(matches[match], 0, longest_name,
-                       FALSE);
+               disp = display_string(matches[match], 0, longest_name, FALSE);
                waddstr(edit, disp);
                free(disp);
 
@@ -2958,8 +2952,7 @@ const char *tail(const char *foo)
 
 #ifndef DISABLE_HISTORIES
 /* Return the constructed dirfile path, or NULL if we can't find the home
- * directory.  The string is dynamically allocated, and should be
- * freed. */
+ * directory.  The string is dynamically allocated, and should be freed. */
 char *construct_filename(const char *str)
 {
     char *newstr = NULL;

diff --git a/src/nano.c b/src/nano.c
index 020d3509a1fc602766a848d8fe3d817f1c5a488b..a5236a738d1fbd4bb854a28cbb40e750dfa51898 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2625,10 +2625,6 @@ int main(int argc, char **argv)
        UNSET(MULTIBUFFER);
 #endif
 
-#ifdef DEBUG
-    fprintf(stderr, "Main: top and bottom win\n");
-#endif
-
     /* If a starting position was given on the command line, go there. */
     if (startline > 0 || startcol > 0)
        do_gotolinecolumn(startline, startcol, FALSE, FALSE);
@@ -2641,6 +2637,10 @@ int main(int argc, char **argv)
     }
 #endif
 
+#ifdef DEBUG
+    fprintf(stderr, "Main: bottom win, top win and edit win\n");
+#endif
+
     display_main_list();
 
     display_buffer();

diff --git a/src/winio.c b/src/winio.c
index d55fd920d919e58aac6ddfd1226f94f43fc68cff..d2264fce755f6c461a85a6bd321aaf6656ae20a7 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2145,11 +2145,11 @@ void statusbar(const char *msg, ...)
     waddstr(bottomwin, " ]");
     wattroff(bottomwin, A_BOLD);
     wattroff(bottomwin, interface_color_pair[STATUS_BAR].pairnum);
+
     wnoutrefresh(bottomwin);
+   /* Leave the cursor in the edit window, not in the statusbar. */
     reset_cursor();
     wnoutrefresh(edit);
-       /* Leave the cursor at its position in the edit window, not in
-        * the statusbar. */
 
     disable_cursorpos = TRUE;
 
@@ -2955,7 +2955,7 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
     /* If the current line is offscreen, scroll until it's onscreen. */
     if (openfile->current->lineno >= openfile->edittop->lineno + maxrows ||
                openfile->current->lineno < openfile->edittop->lineno)
-       edit_update((ISSET(SMOOTH_SCROLL) && !focusing) ? NONE : CENTER);
+       edit_update((focusing || !ISSET(SMOOTH_SCROLL)) ? CENTER : NONE);
 
 #ifndef NANO_TINY
     /* If the mark is on, update all lines between old_current and current. */
@@ -2997,7 +2997,7 @@ void edit_refresh(void)
 #endif
 
        /* Make sure the current line is on the screen. */
-       edit_update((ISSET(SMOOTH_SCROLL) && !focusing) ? NONE : CENTER);
+       edit_update((focusing || !ISSET(SMOOTH_SCROLL)) ? CENTER : NONE);
     }
 
     foo = openfile->edittop;