fix bug: loading non-elpa packages

KDr2 · May 8, 2015 · 58905fa · 58905fa
1 parent 003378e
commit 58905fa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/init.el b/init.el
@@ -23,9 +23,10 @@
 (require 'init-main)
 
 ;; debug code, to find to enables my auto-fill-mode
-(if (not noninteractive)
-    (defadvice auto-fill-mode (around backtrace-fill-mode activate)
-      (message "------BEFORE-------")
-      (backtrace)
-      ad-do-it
-      (message "------AFTER--------")))
+;;
+;; (if (not noninteractive)
+;;     (defadvice auto-fill-mode (around backtrace-fill-mode activate)
+;;       (message "------BEFORE-------")
+;;       (backtrace)
+;;       ad-do-it
+;;       (message "------AFTER--------")))
diff --git a/src/elisp/init-lang.el b/src/elisp/init-lang.el
@@ -9,9 +9,6 @@
 ;;
 
 
-(add-to-list 'load-path
-             (concatenate 'string user-emacs-directory "src/elisp/lang"))
-
 ;; markdown mode
 (require 'init-md)
 

diff --git a/src/elisp/init-main.el b/src/elisp/init-main.el
@@ -11,6 +11,10 @@
 ;; Common Libraries
 (load-file "~/.emacs.d/src/elisp/common.el")
 
+(dolist (path '("src/elisp/lang" "src/elisp/tools"))
+  (add-to-list 'load-path
+               (concatenate 'string user-emacs-directory path)))
+
 ;; platform vars
 (require 'init-vars)
 

diff --git a/src/elisp/init-non-elpa.el b/src/elisp/init-non-elpa.el
@@ -9,7 +9,6 @@
 ;; package not on elpa
 
 ;; asm/gas mode
-(if-lang 'gas
-         (require 'init-as))
+(require 'init-as)
 
 (provide 'init-non-elpa)
diff --git a/src/elisp/init-tools.el b/src/elisp/init-tools.el
@@ -8,10 +8,6 @@
 ;; This file is not part of GNU Emacs.
 ;;
 
-
-(add-to-list 'load-path
-             (concatenate 'string user-emacs-directory "src/elisp/tools"))
-
 ;; dired
 (require 'init-dired)