Merge remote-tracking branch 'remotes/origin/gh-pages' into master

lib/ace/document.js

@@ -81,7 +81,7 @@ var Document = function(text) {
     };
 
     /**
-    * Returns all the lines in the document as a single string, split by the new line character.
+    * Returns all the lines in the document as a single string, joined by the new line character.
     **/
     this.getValue = function() {
         return this.getAllLines().join(this.getNewLineCharacter());
@@ -191,7 +191,7 @@ var Document = function(text) {
     };
 
     /**
-    * Returns all lines in the document as string array. Warning: The caller should not modify this array!
+    * Returns all lines in the document as string array.
     **/
     this.getAllLines = function() {
         return this.getLines(0, this.getLength());

lib/ace/editor.js

@@ -2370,6 +2370,7 @@ config.defineOptions(Editor.prototype, "editor", {
     wrapBehavioursEnabled: {initialValue: true},
 
     hScrollBarAlwaysVisible: "renderer",
+    vScrollBarAlwaysVisible: "renderer",
     highlightGutterLine: "renderer",
     animatedScroll: "renderer",
     showInvisibles: "renderer",

lib/ace/virtual_renderer.js

@@ -738,9 +738,10 @@ var VirtualRenderer = function(container, theme) {
             this.$changes |= changes;
             return; 
         } 
-        if (!this.$size.width)
+        if (!this.$size.width) {
+            this.$changes |= changes;
             return this.onResize(true);
-            
+        }
         // this.$logChanges(changes);
         
         this._signal("beforeRender");