merge with 1.8f

diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog
index 9a4c800069bcee3a932032322910254b385ec143..78a01fc1eb9bb89bf4493623d001918b0ab930e5 100644 (file)
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -1,5 +1,7 @@
 Sat Oct 23 01:00:12 1993  Jim Meyering  (meyering@comco.com)
 
+       * tr.c (get_next, string2_extend): Add default: label to switch stmt.
+
        * cat.c, cksum.c, comm.c, csplit.c, cut.c, expand.c, fold.c, head.c,
        join.c, nl.c, od.c, paste.c, pr.c, split.c, sum.c, tac.c, tail.c,
        tr.c, unexpand.c, uniq.c, wc.c (usage): Add long --help.

diff --git a/src/tr.c b/src/tr.c
index 19f747fe84fb293061855222f956536c22bd62f4..cb31ceba3e508f1e23770a3a60079e280c2280b9 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -1196,6 +1196,7 @@ get_next (s, class)
       abort ();
       break;
     }
+
   return return_val;
 }