Commit fef3c867 authored by David Lawrence Ramsey's avatar David Lawrence Ramsey
Browse files

fix breakage

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3718 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 6 additions and 7 deletions
+6 -7
...@@ -446,8 +446,7 @@ char *do_browse_from(const char *inpath) ...@@ -446,8 +446,7 @@ char *do_browse_from(const char *inpath)
/* Set filelist to the list of files contained in the directory path, /* Set filelist to the list of files contained in the directory path,
* set filelist_len to the number of files in that list, and set longest * set filelist_len to the number of files in that list, and set longest
* to the width in columns of the longest filename in that list, up to * to the width in columns of the longest filename in that list, up to
* COLS - 1 (but at least 15). Assume path exists and is a * COLS (but at least 15). Assume path exists and is a directory. */
* directory. */
void browser_init(const char *path, DIR *dir) void browser_init(const char *path, DIR *dir)
{ {
const struct dirent *nextdir; const struct dirent *nextdir;
...@@ -466,9 +465,9 @@ void browser_init(const char *path, DIR *dir) ...@@ -466,9 +465,9 @@ void browser_init(const char *path, DIR *dir)
i++; i++;
d_len = strlenpt(nextdir->d_name) + 1; d_len = strlenpt(nextdir->d_name);
if (d_len > longest) if (d_len > longest)
longest = (d_len > COLS - 1) ? COLS - 1 : d_len; longest = (d_len > COLS) ? COLS : d_len;
} }
filelist_len = i; filelist_len = i;
...@@ -497,8 +496,8 @@ void browser_init(const char *path, DIR *dir) ...@@ -497,8 +496,8 @@ void browser_init(const char *path, DIR *dir)
filelist_len = i; filelist_len = i;
closedir(dir); closedir(dir);
if (longest > COLS - 1) if (longest > COLS)
longest = COLS - 1; longest = COLS;
if (longest < 15) if (longest < 15)
longest = 15; longest = 15;
} }
...@@ -622,7 +621,7 @@ void browser_refresh(void) ...@@ -622,7 +621,7 @@ void browser_refresh(void)
foo_col = col - strlenpt(foo); foo_col = col - strlenpt(foo);
mvwaddnstr(edit, line, foo_col, foo, actual_x(foo, longest - mvwaddnstr(edit, line, foo_col, foo, actual_x(foo, longest -
foo_col)); foo_col) + 1);
if (i == selected) if (i == selected)
wattroff(edit, reverse_attr); wattroff(edit, reverse_attr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment