Merge branch 'master' of github.com:github/atom

Atom.xcodeproj/project.pbxproj

@@ -1165,7 +1165,6 @@
 		};
 		0487C93214FED5370045E5E3 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 04F21A2615644AC10083F6D4 /* ResourceConfig.xcconfig */;
 			buildSettings = {
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (

Rakefile

@@ -14,6 +14,12 @@ task :build => :"verify-prerequisites" do
   end
 end
 
+desc "Clean build Atom via `xcodebuild`"
+task :clean do
+  output = `xcodebuild clean SYMROOT=#{BUILD_DIR}`
+  rm_rf BUILD_DIR
+end
+
 desc "Create the Atom.app for distribution"
 task :package => :build do
   if path = application_path()
@@ -37,7 +43,7 @@ task :run => :build do
 end
 
 desc "Run the specs"
-task :test do
+task :test => :clean do
   $ATOM_ARGS.push "--test", "--headless"
   Rake::Task["run"].invoke
 end
@@ -72,22 +78,6 @@ task :"copy-files-to-bundle" => :"verify-prerequisites" do
   end
 end
 
-desc "Change webkit frameworks to use @rpath as install name"
-task :"webkit-fix" do
-  for framework in FileList["frameworks/*.framework"]
-    name = framework[/\/([^.]+)/, 1]
-    executable = framework + "/" + name
-
-    `install_name_tool -id @rpath/#{name}.framework/Versions/A/#{name} #{executable}`
-
-    libs = `otool -L #{executable}`
-    for name in ["JavaScriptCore", "WebKit", "WebCore"]
-      _, path, suffix = *libs.match(/\t(\S+(#{name}.framework\S+))/i)
-      `install_name_tool -change #{path} @rpath/../Frameworks/#{suffix} #{executable}` if path
-    end
-  end
-end
-
 desc "Remove any 'fit' or 'fdescribe' focus directives from the specs"
 task :nof do
   system %{find . -name *spec.coffee | xargs sed -E -i "" "s/f+(it|describe) +(['\\"])/\\1 \\2/g"}

src/app/buffer.coffee

@@ -174,6 +174,8 @@ class Buffer
       when 'c', 'h', 'cpp' then 'c_cpp'
       when 'html', 'htm' then 'html'
       when 'css' then 'css'
+      when 'java' then 'java'
+      when 'xml' then 'xml'
       else 'text'
 
     @mode = new (require("ace/mode/#{modeName}").Mode)