Browse Source

Fix broken merge from 1.9 branch.

Adam Heath 24 years ago
parent
commit
06cbb69e83
2 changed files with 15 additions and 0 deletions
  1. 4 0
      ChangeLog
  2. 11 0
      scripts/install-info.pl

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+Thu Jun 20 00:54:54 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/install-info.pl: Fix broken merge from 1.9 branch.
+
 Sat Jun  1 23:22:19 CDT 2002 Adam Heath <doogie@debian.org>
 
   * dpkg-deb/main.c, main/main.c, main/query.c, dselect/main.cc,

+ 11 - 0
scripts/install-info.pl

@@ -219,11 +219,22 @@ $name: unable to determine description for \`dir' entry - giving up
         }
 
         $align--; $calign--;
+        $lprefix= length($cprefix);
+        if ($lprefix < $align) {
+            $cprefix .= ' ' x ($align - $lprefix);
+            $lprefix= $align;
+        }
+        $prefix= "\n". (' 'x $calign);
         $cwidth= $maxwidth+1;
 
         for $_ (split(/\s+/,$description)) {
             $l= length($_);
             $cwidth++; $cwidth += $l;
+            if ($cwidth > $maxwidth) {
+                $infoentry .= $cprefix;
+                $cwidth= $lprefix+1+$l;
+                $cprefix= $prefix; $lprefix= $calign;
+            }
             $infoentry.= ' '; $infoentry .= $_;
         }