Merge

ikanobori · ikanobori · commit ec293d177c39 · 2009-07-17T13:08:30.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1231,6 +1231,8 @@ def repl(self):
             if inp:
                 self.rl_hist.append(inp + '\n')
             more = self.push(inp) or self.paste_mode
+            if not more:
+                self.s = ''
 
     def size(self):
         """Set instance attributes for x and y top left corner coordinates
@@ -1705,7 +1707,7 @@ def reprint_line(lineno, s, to_replace=[]):
                             # Marker found
                             tokens[i] = (Parenthesis, value)
                             break
-                        elif opening and under_cursor:
+                        elif opening and under_cursor and not newline:
                             if self.cpos:
                                 tokens[i] = (Parenthesis.UnderCursor, value)
                             else:
