X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=init.el;h=43384feba908a79acb6320103794c12cfd88e708;hb=87395fc29e64efbbef5c52bb0ac905cea46e6698;hp=e1aa35291c32461d7619a608c313632eb35d50de;hpb=cf90c2f02ed6707ceca1b5b8c8dd89c82b7eea56;p=dot-emacs

diff --git a/init.el b/init.el
index e1aa352..43384fe 100644
--- a/init.el
+++ b/init.el
@@ -24,22 +24,26 @@
 
 ;; (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/ghci-completion")
+;; 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")
@@ -51,10 +55,10 @@
 ;;(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")
+;; 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")
 
-(toggle-debug-on-error)
 ;;(add-hook 'server-visit-hook 'raise-frame)
 
 
@@ -66,25 +70,13 @@
              ;; todo, set this var in my-init.org and use it instead
              ;; of .emacs.d
              (setq init-dir ,(file-name-directory load-file-name))
+             ;; previously, i was doing byte-recompile-directory, but
+             ;; now i just have one init file
              (unless (equal (user-uid) 0) ; don't make root owned files
-               (byte-recompile-directory init-dir))
-             ;; (byte-recompile-directory init-dir 0) ; with the 0,
-             ;; compile .el files that have no .elc file already
-
-             ;; 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))
-             (org-babel-load-file (expand-file-name "dev.org" init-dir))))
+               (byte-recompile-file (concat init-dir "myinit.el")))
+
+             (load-file (expand-file-name "myinit.el" init-dir))
+
+             ))
 
 ;;init.el ends here