Permalink
Browse files

Unbreakage.

  • Loading branch information...
bodil committed Dec 12, 2013
1 parent d2e05d7 commit f7c734093a0e68c91b6bf8ce792553e0534dab17
Showing with 6 additions and 25 deletions.
  1. +1 −0 .gitignore
  2. +0 −3 .gitmodules
  3. +1 −1 bodil-complete.el
  4. +1 −0 bodil-nav.el
  5. +2 −2 bodil-theme.el
  6. +1 −18 init.el
  7. +0 −1 site-lisp/auto-complete
View
@@ -32,3 +32,4 @@ elpa
/eshell/lastdir
/projectile-bookmarks.eld
/.helm-backup
+/.achievements
View
@@ -1,6 +1,3 @@
-[submodule "site-lisp/auto-complete"]
- path = site-lisp/auto-complete
- url = git://github.com/auto-complete/auto-complete.git
[submodule "site-lisp/tern"]
path = site-lisp/tern
url = git://github.com/marijnh/tern.git
View
@@ -1,6 +1,6 @@
;;; complete.el -- Auto completion
-(package-require 'popup)
+(package-require 'auto-complete)
(require 'auto-complete-config)
(ac-config-default)
(add-to-list 'ac-dictionary-directories (concat dotfiles-dir "site-lisp/auto-complete/dict"))
View
@@ -30,6 +30,7 @@
;;; Project Explorer
+(package-require 'helm)
(package-require 'project-explorer)
(require 'project-explorer)
(setq-default pe/width 28)
View
@@ -88,8 +88,8 @@
;; (set-face-background 'hl-line "#191919")
;; (set-face-background 'linum nil)
;; (set-face-foreground 'linum "#acacfc")
- (set-face-foreground 'powerline-active1 "#aaa")
- (set-face-foreground 'powerline-active2 "#ddd")
+ ;; (set-face-foreground 'powerline-active1 "#aaa")
+ ;; (set-face-foreground 'powerline-active2 "#ddd")
(setq ansi-term-color-vector ['unspecified
"#3f3f3f" "#cc9393" "#7f9f7f" "#f0dfaf"
"#8cd0d3" "#dc8cc3" "#93e0e3" "#dcdccc"]))
View
19 init.el
@@ -72,23 +72,6 @@
;; Define subpackages by platform
-(setq bodil-pkg-android
- '(bodil-defuns
- bodil-session
- bodil-nav
- bodil-editing
- bodil-snippets
- bodil-ido
- bodil-lisp
- ;; bodil-paredit
- bodil-smartparens
- bodil-magit
- bodil-terminal
- bodil-orgmode
- bodil-codestyle
- bodil-dired
- bodil-helm))
-
(setq bodil-pkg-full
'(bodil-defuns
bodil-session
@@ -123,7 +106,7 @@
bodil-chat))
;; Now load other things
-(dolist (file (if (string-prefix-p "android" hostname) bodil-pkg-android bodil-pkg-full))
+(dolist (file bodil-pkg-full)
(require file))
(Xlaunch (require 'bodil-x11))
Submodule auto-complete deleted from da8643

0 comments on commit f7c7340

Please sign in to comment.