Merge branch 'yelp' of github.com:IvanMalison/.emacs.d into yelp

* 'yelp' of github.com:IvanMalison/.emacs.d:
  Changed default theme to solarized.
This commit is contained in:
Ivan Malison 2013-03-26 10:16:53 -07:00
commit 4d461eebbd
3 changed files with 14 additions and 2 deletions

3
.gitmodules vendored
View File

@ -13,3 +13,6 @@
[submodule "emacs-for-python"]
path = emacs-for-python
url = git@github.com:IvanMalison/emacs-for-python.git
[submodule "themes/solarized"]
path = themes/solarized
url = git@github.com:sellout/emacs-color-theme-solarized.git

12
init.el
View File

@ -19,7 +19,8 @@
(normal-top-level-add-subdirs-to-load-path))
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/zenburn")
(load-theme 'zenburn t)
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/solarized")
(load-theme 'solarized-dark t)
;; =============================================================================
;; General Emacs Options
@ -218,4 +219,11 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-safe-themes (quote ("36a309985a0f9ed1a0c3a69625802f87dee940767c9e200b89cdebdb737e5b29" default))))
'(ansi-color-names-vector ["#e4e4e4" "#d70000" "#5f8700" "#af8700" "#0087ff" "#af005f" "#00afaf" "#808080"])
'(ansi-term-color-vector ["#3f3f3f" "#cc9393" "#7f9f7f" "#f0dfaf" "#8cd0d3" "#dc8cc3" "#93e0e3" "#dcdccc"])
'(background-color "#ffffd7")
'(background-mode light)
'(cursor-color "#626262")
'(custom-safe-themes (quote ("fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "36a309985a0f9ed1a0c3a69625802f87dee940767c9e200b89cdebdb737e5b29" default)))
'(fci-rule-color "#383838")
'(foreground-color "#626262"))

1
themes/solarized Submodule

@ -0,0 +1 @@
Subproject commit ec7dc872858bed95e71a7d23ddba5488699cdf58