summaryrefslogtreecommitdiffstats
path: root/emacs.d
diff options
context:
space:
mode:
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/00-paths.el3
-rw-r--r--emacs.d/20-folding.el22
2 files changed, 10 insertions, 15 deletions
diff --git a/emacs.d/00-paths.el b/emacs.d/00-paths.el
index 1990c59..e883739 100644
--- a/emacs.d/00-paths.el
+++ b/emacs.d/00-paths.el
@@ -1,5 +1,2 @@
(add-to-list 'load-path "~/.emacs.d/elisp")
(add-to-list 'load-path "~/.emacs.d/naquadah-theme")
-(add-to-list 'load-path "~/.emacs.d/auto-complete-clang")
-(add-to-list 'load-path "~/.emacs.d/nxhtml")
-(add-to-list 'load-path "~/.emacs.d/elisp/muse")
diff --git a/emacs.d/20-folding.el b/emacs.d/20-folding.el
index f59c11a..fcf7cc4 100644
--- a/emacs.d/20-folding.el
+++ b/emacs.d/20-folding.el
@@ -1,12 +1,10 @@
-(autoload 'folding-mode "folding" "Folding mode" t)
-
-(add-hook 'folding-mode-hook
- (lambda ()
- (local-set-key [C-tab] 'folding-toggle-show-hide)))
-
-(add-hook 'c-mode-hook
- (lambda ()
- (folding-mode)))
-(add-hook 'emacs-lisp-mode-hook
- (lambda ()
- (folding-mode)))
+(if (load "folding")
+ (progn (add-hook 'folding-mode-hook
+ (lambda ()
+ (local-set-key [C-tab] 'folding-toggle-show-hide)))
+ (add-hook 'c-mode-hook
+ (lambda ()
+ (folding-mode)))
+ (add-hook 'emacs-lisp-mode-hook
+ (lambda ()
+ (folding-mode)))))