Merge branch 'master' of https://github.com/slipset/emacs

slipset · Aug 4, 2015 · e78b668 · e78b668
2 parents fa9b207 + 6365f7f
commit e78b668
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/elisp/slipset-display.el b/elisp/slipset-display.el
@@ -3,16 +3,17 @@
 
 (setq screen-width (x-display-pixel-width))
 (setq screen-height (x-display-pixel-height))
+(set-face-attribute 'default nil :family slipset-font-family)
 
 (cond
  ((eq 1050 screen-height) (set-face-attribute 'default nil :height 100))
+ ((eq 1200 screen-height) (set-face-attribute 'default nil :height 120))
  ('t (set-face-attribute 'default nil :height 130)))
 
-(set-face-attribute 'default nil :family "Consolas")
-(set-face-attribute 'default nil :height 100)
+
 
 (toggle-frame-maximized)
 
-(load-theme 'atom-dark)
+(load-theme 'atom-dark t)
 
 (provide 'slipset-display)
diff --git a/elisp/slipset-osx.el b/elisp/slipset-osx.el
@@ -1,8 +1,12 @@
 (setq default-input-method "MacOSX")
 (setq mac-option-modifier 'none)
-(setq mac-command-modifier 'meta)))
+(setq mac-command-modifier 'meta)
 (set-frame-size (selected-frame) 162 54)
 
 (setq slipset-eclim-executable "/Applications/eclipse/eclim")
-(setq slipset-eclipse-dirs '("/Applications/eclipse"))
+(setq slipset-eclim-eclipse-dirs '("/Applications/eclipse"))
+
+(setq slipset-font-family "Monaco")
+
+
 (provide 'slipset-osx)
diff --git a/elisp/slipset-windows-nt.el b/elisp/slipset-windows-nt.el
@@ -2,3 +2,6 @@
 
 (setq slipset-eclim-executable "C:/dev/eclipse/eclipse/eclim.bat")
 (setq slipset-eclim-eclipse-dirs '("C:/dev/eclipse/eclipse"))
+
+(setq slipset-font-family "Consolas")
+
diff --git a/init.el b/init.el
@@ -26,6 +26,7 @@
 									 ensime
 									 jabber
 									 emacs-eclim
+									 atom-dark-theme
 									 editorconfig
 									 rcirc))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,6 @@

		(setq slipset-eclim-executable "C:/dev/eclipse/eclipse/eclim.bat")
		(setq slipset-eclim-eclipse-dirs '("C:/dev/eclipse/eclipse"))

		(setq slipset-font-family "Consolas")
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ @@
     									 ensime
     									 jabber
     									 emacs-eclim
+    									 atom-dark-theme
     									 editorconfig
     									 rcirc))
@@ Expand Down @@