Merge branch 'master' into global-find

Conflicts: spec/app/editor-spec.coffee
2026-04-28 03:01:47 -04:00 · 2012-07-16 09:16:07 -07:00
parent 1ac6581f33 e089b74867
commit 3e3bc99161
3 changed files with 14 additions and 10 deletions
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -659,7 +659,7 @@ class Editor extends View
    if width > @scrollView.width()
      @renderedLines.width(width)
    else
-      @renderedLines.width(@scrollView.width())
+      @renderedLines.width("inherit")

  handleScrollHeightChange: ->
    scrollHeight = @lineHeight * @screenLineCount()