github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-15 09:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into github-code-theme

Browse Source
This commit is contained in:
Jon Rohan
2013-02-01 11:10:45 -05:00
parent 23383b72d8 f62e49d2f4
commit 44cd412bd8
11 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/edit-session.coffee
View File

@@ -18,7 +18,7 @@ class EditSession
if fs.exists(state.buffer)
session = project.buildEditSessionForPath(state.buffer)
else
console.warn "Could not build edit session for path '#{state.buffer}' because that file no longer exists"
console.warn "Could not build edit session for path '#{state.buffer}' because that file no longer exists" if state.buffer
session = project.buildEditSessionForPath(null)
session.setScrollTop(state.scrollTop)
session.setScrollLeft(state.scrollLeft)

2
src/app/load-text-mate-packages-task.coffee
View File

@@ -1,4 +1,4 @@
Task = require 'Task'
Task = require 'task'
module.exports =
class LoadTextMatePackagesTask extends Task

4
src/app/text-mate-theme.coffee
View File

@@ -75,8 +75,8 @@ class TextMateTheme extends Theme
if fontStyle
fontStyles = fontStyle.split(/\s+/)
# properties['font-weight'] = 'bold' if _.contains(fontStyles, 'bold')
# properties['font-style'] = 'italic' if _.contains(fontStyles, 'italic')
properties['font-weight'] = 'bold' if _.contains(fontStyles, 'bold')
properties['font-style'] = 'italic' if _.contains(fontStyles, 'italic')
properties['text-decoration'] = 'underline' if _.contains(fontStyles, 'underline')
properties['color'] = @translateColor(foreground) if foreground