Merge branch 'master' of https://github.com/darthsuogles/emacs_dev

Philip Yang · Philip Yang · commit bcae03bc6869 · 2016-05-22T16:33:12.000-07:00
diff --git a/emacs-common.el b/emacs-common.el
@@ -131,6 +131,7 @@
    python-shell-interpreter-args "--pylab"
    )
   )
+)
 
 ;;--------------------------------------------------------------------
 ;; Scala
diff --git a/emacs-sbt-mode b/emacs-sbt-mode
@@ -1 +1 @@
-Subproject commit 6d54d496efab7c8dd5c0b782ffe6e239479e6bc2
+Subproject commit f1514212d86643c4bf1657ff6682b66472a69362

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@`
`131`	`131`	`python-shell-interpreter-args "--pylab"`
`132`	`132`	`)`
`133`	`133`	`)`
	`134`	`+)`
`134`	`135`
`135`	`136`	`;;--------------------------------------------------------------------`
`136`	`137`	`;; Scala`