X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=init.el;h=e1aa35291c32461d7619a608c313632eb35d50de;hb=cf90c2f02ed6707ceca1b5b8c8dd89c82b7eea56;hp=16be261951024f93fe98a7a23a47a8ffb08ef70e;hpb=3dc7ccc943c54180d31e6a28761778562f8c0be2;p=dot-emacs diff --git a/init.el b/init.el index 16be261..e1aa352 100644 --- a/init.el +++ b/init.el @@ -35,16 +35,14 @@ (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") +;; (add-to-list 'load-path "~/.emacs.d/elpa/smartparens-20140328.809") +;; (add-to-list 'load-path "~/.emacs.d/elpa/dash-20140308.656") -(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") +;;(add-to-list 'load-path "~/.emacs.d/src/ghci-completion") (add-to-list 'load-path "~/.emacs.d/emacs/site-lisp/org") ;; 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") @@ -56,12 +54,8 @@ (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") - - -(add-hook 'server-visit-hook 'raise-frame) +(toggle-debug-on-error) +;;(add-hook 'server-visit-hook 'raise-frame) ;; load init in `after-init-hook' so all packages are loaded @@ -80,13 +74,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))) + ;; (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 +;;init.el ends here