X-Git-Url: https://iankelling.org/git/?p=dot-emacs;a=blobdiff_plain;f=init.el;h=4f096ae856b24c4c73ba1c76a5b6fac97bd84774;hp=b3312e46f0b7b6533593cc9e3f6ab92b6f337bdd;hb=da907fbf50cbb4eb2b32238fc077fa919726f974;hpb=4d60a06fd8f3524e1b48f729be314bea09652713

diff --git a/init.el b/init.el
index b3312e4..4f096ae 100644
--- a/init.el
+++ b/init.el
@@ -24,27 +24,29 @@
 
 ;; (toggle-debug-on-error) ;uncomment to help debug
 
-;; stop from minimizing & freezing the gui
 
-;; Added by Package.el.  This must come before configurations of
-;; installed packages.  Don't delete this line.  If you don't want it,
-;; just comment it out by adding a semicolon to the start of the line.
-;; You may delete these explanatory comments.
-(package-initialize)
+;; Package.el added this a long time ago. emacs 26 gives a warning that
+;; this is obsolete, but it doesn't happen automatically in batch mode,
+;; and then emacs dies on error, so it doesn't seem obsolete to me.
 
-(global-unset-key (kbd "C-z"))
 
-;; these need to be done before the hook in order to satisfy the byte compiler
-(add-to-list 'load-path "~/.emacs.d/elpa/smartparens-20140328.809")
-(add-to-list 'load-path "~/.emacs.d/elpa/dash-20140308.656")
+;; stop from minimizing & freezing the gui
+;; used to freeze emacs and was really annoying,
+;; seems its changed now. no harm in keeping this though.
+(global-unset-key (kbd "C-z"))
 
-(add-to-list 'load-path "~/.emacs.d/src/yasnippet")
-(add-to-list 'load-path "~/.emacs.d/src/ghci-completion")
-(add-to-list 'load-path "~/.emacs.d/src")
+;; these need to be done before the hook in order to satisfy the byte compiler or batch mode
 (add-to-list 'load-path "~/.emacs.d/emacs/site-lisp/org")
+(add-to-list 'load-path "~/.emacs.d/src/readline-complete")
+(add-to-list 'load-path "~/.emacs.d/src/bbdb-csv-import")
+(add-to-list 'load-path "~/.emacs.d/src/ghci-completion")
+(add-to-list 'load-path "~/.emacs.d/src/mediawiki-el")
+(add-to-list 'load-path "~/.emacs.d/src/spray")
+(add-to-list 'load-path "~/.emacs.d/src/visible-mark")
+
 
 ;; git version of gnus
-(add-to-list 'load-path "~/.emacs.d/src/gnus/lisp")
+;; (add-to-list 'load-path "~/.emacs.d/src/gnus/lisp")
 (require 'info)
 (add-to-list 'Info-default-directory-list "~/.emacs.d/src/gnus/texi")
 
@@ -53,15 +55,11 @@
 ;;(require 'haskell-mode-autoloads)
 ;;(add-to-list 'Info-default-directory-list "~/.emacs.d/src/haskell-mode")
 
-(require 'bbdb-loaddefs "~/.emacs.d/src/bbdb/lisp/bbdb-loaddefs.el")
-(setq bbdb-print-tex-path "~/.emacs.d/src/bbdb/tex")
-
-
-(add-to-list 'load-path "/a/opt/magit/git-modes")
-(add-to-list 'load-path "/a/opt/magit/magit")
+;; for using custom/upstream bbdb
+;;(require 'bbdb-loaddefs "~/.emacs.d/src/bbdb/lisp/bbdb-loaddefs.el")
+;;(setq bbdb-print-tex-path "~/.emacs.d/src/bbdb/tex")
 
-
-(add-hook 'server-visit-hook 'raise-frame)
+;;(add-hook 'server-visit-hook 'raise-frame)
 
 
 ;; load init in `after-init-hook' so all packages are loaded
@@ -80,12 +78,17 @@
              ;; this must be loaded first to avoid an error:  void-function(cl-member)
              (require 'cl)
              ;;  added org-habit, org-drill, org-mobile from the defaults
+             ;; disabled because I'm not using org-drill, and I see
+             ;; this error on startup of emacs server,
+             ;; which might be nothing but meh,
+             ;; File mode specification error: (void-function org-drill-add-cloze-fontification)
 
              (require 'org)
-             (setq org-modules (quote (org-bbdb org-bibtex org-docview org-gnus
-                                                org-info org-jsinfo org-irc org-mew
-                                                org-mhe org-rmail org-vm org-wl org-w3m
-                                                org-habit org-drill org-mobile)))
-             (org-babel-load-file (expand-file-name "my-init.org" init-dir))))
-
-;;; init.el ends here
+             ;; (setq org-modules (quote (org-bbdb org-bibtex org-docview org-gnus
+             ;;                                    org-info org-jsinfo org-irc org-mew
+             ;;                                    org-mhe org-rmail org-vm org-wl org-w3m
+             ;;                                    org-habit org-drill org-mobile)))
+             (org-babel-load-file (expand-file-name "my-init.org" init-dir))
+             (org-babel-load-file (expand-file-name "dev.org" init-dir))))
+
+;;init.el ends here