Merge branch 'release-v0.2'

philsf · Sep 20, 2017 · 8423ee0 · 8423ee0
2 parents 2cb32fe + c0ee95b
commit 8423ee0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/init.el b/init.el
@@ -42,16 +42,18 @@
  ;; If there is more than one, they won't work right.
  '(case-fold-search t)
  '(current-language-environment "UTF-8")
+ '(custom-safe-themes
+   (quote
+    ("8e367d9dd0c2bc53d216fceaae1c10bb0ab5e2a3f74ad5886efc18596cb6b6c0" "46745f59a6f44e22fd7b28a2f5d172e99dc06f20a6460ef7e2e1547bd4dbb10c" "b097e86d5a56fb34f8d7e7f10cdea34887e801c40152494e4fc54c1a3bfec49e" "7410d9a225a549456708673711a16e736d060e18145d31565f79658a331908ea" "c117c30db5c03f80d751b4237fefa19f289a89c064c16f2a71ace5b989bf2b12" "d997b3917b4929de98b0f1d0f1885a1e817b7167e722aac7c79a2f11f30ea476" "a1ab68e3fbfef75eb91b31e32170913f1c60a6e903d9057a51fee7c6395ed9a0" "b5715f89290691b507de6aa532b75db45ca1bd1e1b81a959bf3f225601d844e7" "6570843991e40121f854432826e9fd175aec6bd382ef217b2c0c46da37f3af18" "7a6936c94b90024f0cfa7c7579667093cda75a8f17761617c63ba80d6de6db33" "d552a89a5691c846c42efda2d9eca85b07375baf1a373a13cd3e2381affca692" "75a696bc7160537d6071073f50422d1db6315ea303d33d622dbf5d8d413add0f" "587d5e8ac355074b51471b7ecdf05213a33f40515fd5027e4796ea6370a7efa8" "555065b4cca21d27b1c799633e0e3cc7c02be5b19d93c1fcd6818e3f1ed08944" default)))
  '(default-input-method "rfc1345")
  '(display-time-mode t)
  '(global-font-lock-mode t)
  '(inhibit-startup-screen t)
  '(mouse-wheel-mode t)
  '(show-paren-mode t)
+ ;; '(custom-enabled-themes (quote (philsf-ubuntu)))
  ;; '(custom-enabled-themes (quote (philsf-windows)))
- '(custom-safe-themes
-   (quote
-    ("75a696bc7160537d6071073f50422d1db6315ea303d33d622dbf5d8d413add0f" "587d5e8ac355074b51471b7ecdf05213a33f40515fd5027e4796ea6370a7efa8" "555065b4cca21d27b1c799633e0e3cc7c02be5b19d93c1fcd6818e3f1ed08944" default)))
+ '(custom-enabled-themes (quote (philsf-global)))
  '(ess-R-font-lock-keywords
    (quote
     ((ess-R-fl-keyword:modifiers . t)

diff --git a/philsf-global-theme.el b/philsf-global-theme.el
@@ -12,8 +12,10 @@
  '(mouse-wheel-mode t)
  '(show-paren-mode t))
 
-(custom-theme-set-faces
- 'philsf-global
- )
+;; (custom-theme-set-faces
+;;  'philsf-global
+;;  )
+
+(add-hook 'after-init-hook (lambda () (load-theme 'zerodark)))
 
 (provide-theme 'philsf-global)
diff --git a/philsf-ubuntu-theme.el b/philsf-ubuntu-theme.el
@@ -9,4 +9,7 @@
  'philsf-ubuntu
  '(default ((t (:family "Ubuntu Mono" :foundry "DAMA" :slant normal :weight normal :height 120 :width normal)))))
 
+;; (add-hook 'after-init-hook (lambda () (load-theme 'philsf-global)))
+(add-hook 'after-init-hook (lambda () (load-theme 'zerodark)))
+
 (provide-theme 'philsf-ubuntu)
diff --git a/philsf-windows-theme.el b/philsf-windows-theme.el
@@ -9,4 +9,6 @@
  'philsf-windows
  '(default ((t (:family "Consolas" :foundry "outline" :slant normal :weight normal :height 98 :width normal)))))
 
+(add-hook 'after-init-hook (lambda () (load-theme 'zerodark)))
+
 (provide-theme 'philsf-windows)