diff --git a/elisp/custom.el b/elisp/custom.el index 0f5adde..d58ff04 100644 --- a/elisp/custom.el +++ b/elisp/custom.el @@ -3,12 +3,9 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(custom-safe-themes - (quote - ("67e998c3c23fe24ed0fb92b9de75011b92f35d3e89344157ae0d544d50a63a72" default))) '(package-selected-packages (quote - (org-ref json-mode cargo racer ess-smart-underscore company-tern auto-complete markdown-mode xref-js2 js2-refactor js2-mode writeroom-mode weechat counsel ivy-bibtex org-bullets paredit zenburn-theme slime rust-mode racket-mode polymode org lua-mode haskell-mode geiser ergoemacs-mode djvu auctex))) + (poly-noweb julia-mode zenburn-theme xref-js2 writeroom-mode slime racket-mode racer polymode paredit org-ref org-bullets org lua-mode json-mode js2-refactor ivy-bibtex haskell-mode geiser ess-smart-underscore counsel company-tern cargo auto-complete))) '(tramp-syntax (quote default) nil (tramp))) (custom-set-faces ;; custom-set-faces was added by Custom. diff --git a/elisp/extras.el b/elisp/extras.el index a4b19e9..3f16227 100644 --- a/elisp/extras.el +++ b/elisp/extras.el @@ -12,7 +12,7 @@ ;; load my custom setups (load "~/.emacs.d/elisp/org-setup.el") ;(load "~/.emacs.d/elisp/slime-setup.el") -(load "~/.emacs.d/elisp/polymode-setup.el") +;(load "~/.emacs.d/elisp/polymode-setup.el") (load "~/.emacs.d/elisp/outline-keymap.el") (load "~/.emacs.d/elisp/bibtex-setup.el") (load "~/.emacs.d/elisp/ivy-setup.el") diff --git a/elisp/polymode-setup.el b/elisp/polymode-setup.el index 57a1e0e..ec0d17d 100644 --- a/elisp/polymode-setup.el +++ b/elisp/polymode-setup.el @@ -1,4 +1,4 @@ -(require 'poly-c) +;;(require 'poly-c) ;; C (add-to-list 'auto-mode-alist '("\\.nw$" . poly-noweb+c-mode))