Index: /branches/pyyaml3000/tests/data/scan-line-break-bug.data
===================================================================
--- /branches/pyyaml3000/tests/data/scan-line-break-bug.data	(revision 60)
+++ /branches/pyyaml3000/tests/data/scan-line-break-bug.data	(revision 60)
@@ -0,0 +1,3 @@
+foo:
+    bar
+    baz
Index: /branches/pyyaml3000/tests/data/scan-line-break-bug.canonical
===================================================================
--- /branches/pyyaml3000/tests/data/scan-line-break-bug.canonical	(revision 60)
+++ /branches/pyyaml3000/tests/data/scan-line-break-bug.canonical	(revision 60)
@@ -0,0 +1,3 @@
+%YAML 1.1
+---
+!!map { ? !!str "foo" : !!str "bar baz" }
Index: /branches/pyyaml3000/lib/yaml/scanner.py
===================================================================
--- /branches/pyyaml3000/lib/yaml/scanner.py	(revision 57)
+++ /branches/pyyaml3000/lib/yaml/scanner.py	(revision 60)
@@ -96,5 +96,5 @@
         # - after '{', '[', ',' (in the flow context),
         # - after '?', ':', '-' (in the block context).
-        # In the block context, this flag also signify if a block collection
+        # In the block context, this flag also signifies if a block collection
         # may start at the current position.
         self.allow_simple_key = True
@@ -1399,5 +1399,5 @@
         if ch in u'\r\n\x85':
             if self.reader.prefix(2) == u'\r\n':
-                self.forward(2)
+                self.reader.forward(2)
             else:
                 self.reader.forward()