mirror of git://git.sv.gnu.org/nano.git
miscellaneous comment fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3969 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
parent
90c5a908ee
commit
8125e08bfa
|
@ -1,4 +1,6 @@
|
|||
CVS code -
|
||||
- General:
|
||||
- Miscellaneous comment fixes. (DLR)
|
||||
- nano.h:
|
||||
- Rename NANO_ALT_REPLACE_KEY to NANO_REPLACE_ALTKEY, for
|
||||
consistency. (DLR)
|
||||
|
|
|
@ -621,19 +621,20 @@ void browser_refresh(void)
|
|||
/* The length of the file information in columns. */
|
||||
int foomaxlen = 7;
|
||||
/* The maximum length of the file information in
|
||||
* columns: 7 for "--", "(dir)", or the file size, and
|
||||
* 12 for "(parent dir)". */
|
||||
* columns: seven for "--", "(dir)", or the file size,
|
||||
* and 12 for "(parent dir)". */
|
||||
bool dots = (COLS >= 15 && filetaillen >= longest -
|
||||
foomaxlen - 1);
|
||||
/* Do we put an ellipsis before the filename? Don't set
|
||||
* this to TRUE if we have fewer than 15 columns (i.e. 1
|
||||
* column for padding, plus 7 columns for a filename
|
||||
* other than ".."). */
|
||||
* this to TRUE if we have fewer than 15 columns (i.e.
|
||||
* one column for padding, plus seven columns for a
|
||||
* filename other than ".."). */
|
||||
char *disp = display_string(filetail, dots ? filetaillen -
|
||||
longest + foomaxlen + 4 : 0, longest, FALSE);
|
||||
/* If we put an ellipsis before the filename, reserve 1
|
||||
* column for padding, plus 7 columns for "--", "(dir)",
|
||||
* or the file size, plus 3 columns for the ellipsis. */
|
||||
/* If we put an ellipsis before the filename, reserve
|
||||
* one column for padding, plus seven columns for "--",
|
||||
* "(dir)", or the file size, plus three columns for the
|
||||
* ellipsis. */
|
||||
|
||||
/* Start highlighting the currently selected file or
|
||||
* directory. */
|
||||
|
|
|
@ -609,8 +609,8 @@ size_t help_line_len(const char *ptr)
|
|||
while (*(ptr + retval) != '\0' && *(ptr + retval) != '\n')
|
||||
retval += move_mbright(ptr + retval, 0);
|
||||
|
||||
/* If the entire line doesn't go more than 1 column beyond where we
|
||||
* tried to break it, we should display it as-is. Otherwise, we
|
||||
/* If the entire line doesn't go more than one column beyond where
|
||||
* we tried to break it, we should display it as-is. Otherwise, we
|
||||
* should display it only up to the break. */
|
||||
if (strnlenpt(ptr, retval) > help_cols + 1)
|
||||
retval = retval_save;
|
||||
|
|
|
@ -2095,8 +2095,9 @@ void titlebar(const char *path)
|
|||
if (!newfie) {
|
||||
size_t lenpt = strlenpt(path), start_col;
|
||||
|
||||
/* Don't set dots to TRUE if we have fewer than 8 columns (i.e.
|
||||
* 1 column for padding, plus 7 columns for a filename). */
|
||||
/* Don't set dots to TRUE if we have fewer than eight columns
|
||||
* (i.e. one column for padding, plus seven columns for a
|
||||
* filename). */
|
||||
dots = (space >= 8 && lenpt >= space);
|
||||
|
||||
if (dots) {
|
||||
|
|
Loading…
Reference in New Issue