Merge pull request #1 from escherize/master

Removed non-compiling packages from packages.el,
AlexBaranosky · Apr 15, 2014 · 69bd383 · 69bd383
2 parents 8106d85 + b6b1d0a
commit 69bd383
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,9 @@
+EmacsPlusPlus is an extensible basic Emacs setup
+================================================
+
+ * Add your user-specific code to ~/.emacs.d/userspecific.
+ * To install:
+   ```bash
+   git submodule init
+   git submodule update
+   ```
diff --git a/README.org b/README.org
diff --git a/core.el b/core.el
@@ -174,8 +174,8 @@ buffer is not visiting a file."
 
 
 ;; Elisp go-to-definition with M-. and back again with M-,
-(autoload 'elisp-slime-nav-mode "elisp-slime-nav")
-(add-hook 'emacs-lisp-mode-hook (lambda () (elisp-slime-nav-mode t)))
+;(autoload 'elisp-slime-nav-mode "elisp-slime-nav")
+;(add-hook 'emacs-lisp-mode-hook (lambda () (elisp-slime-nav-mode t)))
 ;; (eval-after-load 'elisp-slime-nav '(diminish 'elisp-slime-nav-mode))
 
 ;; Turn off mouse interface early in startup to avoid momentary display

diff --git a/custom.el b/custom.el
@@ -10,8 +10,5 @@
  ;; 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-enabled-themes (quote (sanityinc-tomorrow-eighties)))
- '(custom-safe-themes
-   (quote
-    ("628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" default)))
+ '(custom-safe-themes (quote ("628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" default)))
  '(haskell-mode-hook (quote (turn-on-haskell-indentation))))
diff --git a/extensions/emacs++-catchall.el b/extensions/emacs++-catchall.el
@@ -77,7 +77,7 @@
 ;;(load-theme 'sanityinc-solarized-dark)
 ;;(color-theme-sanityinc-tomorrow-eighties)
 ;;(load-theme 'tsdh-dark)
-(moe-dark)
+;;;;; (moe-dark)
 ;; (load-theme 'twilight-theme)
 ;; (load-theme 'clues)
 ;;(load-theme 'cyberpunk)

diff --git a/packages.el b/packages.el
@@ -63,7 +63,7 @@
                    inf-ruby
                    jabber
                    key-chord
-                   malabar-mode
+                   ;; malabar-mode
                    markdown-mode
                    mic-paren
                    ;;; mmm-mode
@@ -93,7 +93,7 @@
 
                    color-theme-sanityinc-solarized
                    color-theme-sanityinc-tomorrow
-                   moe-theme
+                   ;;; moe-theme
                    ;; js2-mode
                    ;; js2-refactor
                    ;; clues-theme

diff --git a/site-lisp.el b/site-lisp.el
@@ -1,2 +1,3 @@
 (require 'twittering-mode)
 (require 'wgrep)
+