clarify the description of -T/--tabsize a bit in usage(), and add extra

{}'s to sunder() and unsunder() to make them a bit easier to read

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

diff --git a/ChangeLog b/ChangeLog
index 81ef8f1ff971b5a0750ec3b5487271f6286a48c3..e7adace68d69649371fd9b955709709ffb1c5675 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ CVS code -
   shortcut_init()
        - Only allow verbatim input when we're not in view mode. (DLR)
 - nano.c:
+  usage()
+       - Clarify the description for -T/--tabsize a bit. (DLR)
   do_verbatim_input()
        - Remove the now-unneeded code to disable XON, XOFF, and
          suspend, since we now go into raw mode in

diff --git a/src/nano.c b/src/nano.c
index 228147825f947dfde07c1d7859133fae918a98f7..2c1832fb2465e54e2fb0301384f391c1a46fdc8d 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -652,7 +652,7 @@ void usage(void)
 #ifndef NANO_SMALL
     print1opt("-S", "--smooth", _("Smooth scrolling"));
 #endif
-    print1opt(_("-T [num]"), _("--tabsize=[num]"), _("Set width of a tab to num"));
+    print1opt(_("-T [#cols]"), _("--tabsize=[#cols]"), _("Set width of a tab in cols to #cols"));
     print1opt("-V", "--version", _("Print version information and exit"));
 #ifdef ENABLE_COLOR
     print1opt(_("-Y [str]"), _("--syntax [str]"), _("Syntax definition to use"));

diff --git a/src/utils.c b/src/utils.c
index 37d0bcff95fc1515d0a19f90bdb1b07f42a9bcaa..c96001866cfbbf37f983b194d3cfa9d49ae2aae2 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -94,9 +94,10 @@ void null_at(char **data, size_t index)
 void unsunder(char *str, size_t true_len)
 {
     assert(str != NULL);
-    for (; true_len > 0; true_len--, str++)
+    for (; true_len > 0; true_len--, str++) {
        if (*str == '\0')
            *str = '\n';
+    }
 }
 
 /* For non-null-terminated lines.  A line, by definition, shouldn't
@@ -104,9 +105,10 @@ void unsunder(char *str, size_t true_len)
 void sunder(char *str)
 {
     assert(str != NULL);
-    for (; *str != '\0'; str++)
+    for (; *str != '\0'; str++) {
        if (*str == '\n')
            *str = '\0';
+    }
 }
 
 #ifndef HAVE_STRCASECMP