Fixes #26

Makefile

@@ -25,7 +25,7 @@ lint:
 	# (white) 	-> tolerate messy whitespace
 	jslint --node --nomen --bitwise --white --indent=2 ${JS_FILES}
 
-test: test-issues test-functional
+test: lint test-issues test-functional
 
 test-functional:
 	echo 

README.md

@@ -1,6 +1,8 @@
 JS-YAML - YAML 1.1 parser for JavaScript
 ========================================
 
+[![Build Status](https://secure.travis-ci.org/nodeca/js-yaml.png)](http://travis-ci.org/nodeca/js-yaml)
+
 [Online Demo](http://nodeca.github.com/js-yaml/)
 
 This is a native port of [PyYAML](http://pyyaml.org/), the most advanced YAML parser.

lib/js-yaml/scanner.js

@@ -1318,9 +1318,9 @@ Scanner.prototype.scanBlockScalar = function scanBlockScalar(style) {
     // Unfortunately, folding rules are ambiguous.
     //
     // This is the folding according to the specification:
-    
+
     if (folded && lineBreak === '\n' && leadingNonSpace && -1 === ' \t'.indexOf(this.peek())) {
-      if (!breaks) {
+      if (!breaks || !breaks.length) {
         chunks.push(' ');
       }
     } else {

test/issues/issue-26.js

@@ -4,8 +4,8 @@ var issue = module.exports = {},
     source = __dirname + '/data/issue-26.yml';
 
 issue.title = "#26: should convert new line into white space";
-issue.fixed = false;
+issue.fixed = true;
 issue.execute = function () {
   var doc = require(source).shift();
-  assert.equal(doc.test, 'a b c');
+  assert.equal(doc.test, 'a b c\n');
 };