# HG changeset patch
# User catherine@Elli.myhome.westell.com
# Date 1226931420 18000
# Node ID fc31b73cb04debe3cf78aeb599bab1ed5f5404c7
# Parent  e49ded85ba4cdd4ba475397ad1ad00a99ad589b6
attempt reconcile with released version

diff -r e49ded85ba4c -r fc31b73cb04d cmd2.py
--- a/cmd2.py	Thu Nov 13 15:40:59 2008 -0500
+++ b/cmd2.py	Mon Nov 17 09:17:00 2008 -0500
@@ -266,7 +266,7 @@
             result['unterminated'] = result.before
             result['parseable'] = result.after
         else:
-            result['statement'] = result['unterminated'] = result.before
+            result['statement'] = result['unterminated'] = result.before # does not catch output marks
             if command in self.multilineCommands:
                 return result # don't bother with the rest, we're still collecting input
             result += parseSearchResults(self.punctuationPattern, s)