nano

commit a9f79a6130796858f66550fd5faa6e3099e59105
parent 115aeda69b6f45271b8d4f7a10dcf5261714b30c
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sat, 28 May 2016 15:40:39 +0200

tweaks: reindent and rewrap a few lines, and shorten a comment

Diffstat:
M
src/chars.c
 | 
8
+++-----
M
src/winio.c
 | 
9
+++------

2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/chars.c b/src/chars.c
@@ -434,7 +434,7 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
 		(*col)++;
 
 		ctrl_buf_mb = control_mbrep(buf, ctrl_buf_mb,
-			&ctrl_buf_mb_len);
+						&ctrl_buf_mb_len);
 
 		*col += mbwidth(ctrl_buf_mb);
 
@@ -459,10 +459,8 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
 	     * current value of col. */
 	    if (*buf == '\t')
 		*col += tabsize - *col % tabsize;
-	    /* If we have a control character, it's two columns wide:
-	     * one column for the "^" that will be displayed in front of
-	     * it, and one column for its visible equivalent as returned
-	     * by control_mbrep(). */
+	    /* If we have a control character, it's two columns wide: one
+	     * column for the "^", and one for the visible character. */
 	    else if (is_cntrl_char((unsigned char)*buf))
 		*col += 2;
 	    /* If we have a normal character, it's one column wide. */
diff --git a/src/winio.c b/src/winio.c
@@ -1796,7 +1796,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 		int ctrl_buf_mb_len, i;
 
 		ctrl_buf_mb = control_mbrep(buf_mb, ctrl_buf_mb,
-			&ctrl_buf_mb_len);
+						&ctrl_buf_mb_len);
 
 		for (i = 0; i < ctrl_buf_mb_len; i++)
 		    converted[index++] = ctrl_buf_mb[i];
@@ -1861,8 +1861,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 	    converted[index++] = '^';
 	    start_col++;
 
-	    ctrl_buf_mb = control_mbrep(buf_mb, ctrl_buf_mb,
-		&ctrl_buf_mb_len);
+	    ctrl_buf_mb = control_mbrep(buf_mb, ctrl_buf_mb, &ctrl_buf_mb_len);
 
 	    for (i = 0; i < ctrl_buf_mb_len; i++)
 		converted[index++] = ctrl_buf_mb[i];
@@ -1896,9 +1895,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 	    if (using_utf8() && buf_mb_len == 1)
 		buf_mb[1] = '\0';
 #endif
-
-	    nctrl_buf_mb = mbrep(buf_mb, nctrl_buf_mb,
-		&nctrl_buf_mb_len);
+	    nctrl_buf_mb = mbrep(buf_mb, nctrl_buf_mb, &nctrl_buf_mb_len);
 
 	    for (i = 0; i < nctrl_buf_mb_len; i++)
 		converted[index++] = nctrl_buf_mb[i];