latest

.gitignore.orig

@@ -0,0 +1,49 @@
+*.el~
+loaddefs.el*
+backups/*
+auto-save-list
+custom.el
+*elc
+places
+url/cookies
+elpa-to-submit/jabber/jabber.info
+elpa-to-submit/nxhtml/etc/schema/xhtml-loader.rnc
+thumbs/*
+oddmuse/*
+.newsrc-dribble
+.nnmail-cache
+/#.newsrc-dribble#
+.svn
+.DS_Store
+image-dired/
+elim/
+elpa-to-submit/nxhtml/etc/schema/xhtml-loader.rnc~
+session*
+tramp
+\#*
+## exported files
+*el
+starter-kit*html
+doc
+eshell/lastdir
+eshell/history
+eshell/lastdir
+src/auctex
+src/share
+src/var
+src/auctex-src/*elc
+## org stuff
+.org-id-locations
+/src/pandoc/.manual.text.default.pandoc
+/src/pandoc/.manual.text.html.pandoc
+/src/pandoc/.manual.text.latex.pandoc
+/src/pandoc/.manual.text.texinfo.pandoc
+/ac-comphist.dat
+/.#starter-kit-latex.org
+<<<<<<< HEAD
+/elpa/archive-contents
+/.org-id-locations
+=======
+/index.org
+/vc-git.awk
+>>>>>>> upstream/master

.gitmodules.orig

@@ -0,0 +1,21 @@
+[submodule "src/magit"]
+	path = src/magit
+	url = http://github.com/philjackson/magit.git
+[submodule "snippets/text-mode/org-mode"]
+	path = snippets/text-mode/org-mode
+	url = http://github.com/eschulte/yasnippet-org-mode.git
+[submodule "src/org"]
+	path = src/org
+	url = http://orgmode.org/org-mode.git
+<<<<<<< HEAD
+[submodule "src/org2blog"]
+	path = src/org2blog
+	url = git://github.com/punchagan/org2blog.git
+[submodule "src/color-theme-themes/zenburn-emacs"]
+	path = src/color-theme-themes/zenburn-emacs
+	url = git://github.com/bbatsov/zenburn-emacs.git
+=======
+[submodule "src/ebib"]
+	path = src/ebib
+	url = git://repo.or.cz/ebib.git
+>>>>>>> upstream/master

jwbowers.org

@@ -64,7 +64,7 @@
 
             ;; Color Theme from vendor directory
             (load-file
-             "~/.emacs.d/src/color-theme-themes/zenburn-emacs/zenburn.el") 
+             "~/.emacs.d/src/color-theme-themes/zenburn-emacs/color-theme-zenburn.el") 
             ;;(require 'zenburn)
 
             ;;(load-file
@@ -295,9 +295,10 @@
       (setenv "PATH" path-from-shell)
       (setq exec-path (split-string path-from-shell path-separator))))
   ;;(when (equal system-type 'darwin) (set-exec-path-from-shell-PATH))
+  (setenv "PATH" (concat "/Users/jwbowers/.cabal/bin:/usr/local/bin:/usr/texbin:" (getenv "PATH")))
+
   (set-exec-path-from-shell-PATH)
 
-  (setenv "PATH" (concat "/Users/jwbowers/.cabal/bin:" (getenv "PATH")))
 
   ;;(push "/usr/local/bin" "/usr/texbin" exec-path)