[48074] branches/release_1_7/base

[raimue at macports.org]

Revision: 48074
          http://trac.macports.org/changeset/48074
Author:   raimue at macports.org
Date:     2009-03-13 20:00:53 -0700 (Fri, 13 Mar 2009)
Log Message:
-----------
Merging r46810 from trunk:
port/port.tcl - Fixed bug in wrapline.
* maxlen was not being reset to its original length when
  indentfirstline == 0.

Modified Paths:
--------------
    branches/release_1_7/base/src/port/port.tcl

Property Changed:
----------------
    branches/release_1_7/base/


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46983,47034,47776,47782,47848
/trunk/base/base:45161
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46810,46983,47034,47776,47782,47848
/trunk/base/base:45161

Modified: branches/release_1_7/base/src/port/port.tcl
===================================================================
--- branches/release_1_7/base/src/port/port.tcl	2009-03-14 00:52:22 UTC (rev 48073)
+++ branches/release_1_7/base/src/port/port.tcl	2009-03-14 03:00:53 UTC (rev 48074)
@@ -477,13 +477,15 @@
             lappend lines $newline
             set newline $indent
             set joiner ""
+            # If indentfirstline is set to 0, reset maxlen to its
+            # original length after appending the first line to lines.
+            if {$first == 1 && $indentfirstline == 0} {
+                set maxlen [expr $maxlen + [string length $indent]]
+            }
+            set first 0
         }
         append newline $joiner $word
         set joiner " "
-        set first 0
-        if {$first == 1 && $indentfirstline == 0} {
-            set maxlen [expr $maxlen + [string length $indent]]
-        }
     }
     lappend lines $newline
     return [join $lines "\n"]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090313/8a041341/attachment.html>