2 files changed, 4 insertions, 3 deletions
diff --git a/ruby.c b/ruby.c
index ad331433dc..d1ae574cdf 100644
--- a/ruby.c
+++ b/ruby.c
@@ -254,6 +254,7 @@ show_usage_part(const char *str, const unsigned int namelen,
     const char *sb = highlight ? esc_bold : esc_none;
     const char *se = highlight ? esc_reset : esc_none;
     unsigned int desclen = (unsigned int)strcspn(desc, "\n");
+    if (!help && desclen > 0 && strchr(".;:", desc[desclen-1])) --desclen;
     if (help && (namelen + 1 > w) && /* a padding space */
         (int)(namelen + secondlen + indent_width) >= columns) {
         printf(USAGE_INDENT "%s" "%.*s" "%s\n", sb, namelen, str, se);
@@ -341,7 +342,7 @@ usage(const char *name, int help, int highlight, int columns)
         M("-S",		   "",			   "Search directories found in the PATH environment variable."),
         M("-v",		   "",			   "Print version; set $VERBOSE to true."),
         M("-w",		   "",			   "Synonym for -W1."),
-        M("-W[level=2|:category]", "", 	           "Set warning flag ($-W):\n"
+        M("-W[level=2|:category]", "",             "Set warning flag ($-W):\n"
             "0 for silent; 1 for moderate; 2 for verbose."),
         M("-x[dirpath]",   "",			   "Execute Ruby code starting from a #!ruby line."),
         M("--jit",         "",                     "Enable JIT for the platform; same as " PLATFORM_JIT_OPTION "."),
@@ -363,7 +364,7 @@ usage(const char *name, int help, int highlight, int columns)
         M("--dump=items",                 "",            "Dump items; see list below."),
         M("--enable=features",            "",            "Enable features; see list below."),
         M("--external-encoding=encoding", "",            "Set default external encoding."),
-        M("--help",		          "",            "Print long help message; use -h for short message."),
+        M("--help",                       "",            "Print long help message; use -h for short message."),
         M("--internal-encoding=encoding", "",            "Set default internal encoding."),
         M("--parser=parser",              "",            "Set Ruby parser: parse.y or prism."),
         M("--verbose",                    "",            "Set $VERBOSE to true; ignore input from $stdin."),
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 8b8d12d5ae..d5626a1a94 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -46,7 +46,7 @@ class TestRubyOptions < Test::Unit::TestCase
   def test_usage
     assert_in_out_err(%w(-h)) do |r, e|
       assert_operator(r.size, :<=, 25)
-      longer = r[1..-1].select {|x| x.size > 80}
+      longer = r[1..-1].select {|x| x.size >= 80}
       assert_equal([], longer)
       assert_equal([], e)
     end