diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-03-14 00:15:18 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-03-14 00:15:18 -0400 |
commit | 165b849169b85ee86d0b07dc56012efcec2b0eba (patch) | |
tree | 229383422990c37bd1cc918891b300cccbf57c3f /.config/emacs | |
parent | 66c5faa2bce8809a1e7e90eec0542b4de07915df (diff) | |
parent | db32e22df76eaa0b1c3eed59c64232a724d26913 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par/master
Diffstat (limited to '.config/emacs')
-rw-r--r-- | .config/emacs/custom.el | 20 | ||||
-rw-r--r-- | .config/emacs/init.el | 12 |
2 files changed, 29 insertions, 3 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index 26eb2ae..d81ac98 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -9,6 +9,26 @@ ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) '(erc-nick "lukeshu") '(explicit-shell-file-name "/bin/bash") + '(org-latex-default-packages-alist + (quote + (("" "fontspec" t) + ("" "fixltx2e" nil) + ("" "graphicx" t) + ("" "longtable" nil) + ("" "float" nil) + ("" "wrapfig" nil) + ("" "rotating" nil) + ("normalem" "ulem" t) + ("" "amsmath" t) + ("" "textcomp" t) + ("" "marvosym" t) + ("" "wasysym" t) + ("" "amssymb" t) + ("" "hyperref" nil) + "\\tolerance=1000"))) + '(org-latex-pdf-process + (quote + ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f"))) '(scroll-bar-mode nil) '(send-mail-function (quote smtpmail-send-it)) '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com") diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 5429c08..5f399a0 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -95,6 +95,7 @@ (smart-tabs-mode 1) (apply 'smart-tabs-insinuate (mapcar 'car smart-tabs-insinuate-alist)))) ;; Major modes + (:name bison-mode :type elpa) (:name coffee-mode :type elpa :after (add-hook 'coffee-mode-hook '(lambda () @@ -102,6 +103,7 @@ (set (make-local-variable 'indent-tabs-mode) nil) ))) (:name graphviz-dot-mode :type elpa) + (:name haml-mode :type elpa) (:name markdown-mode :type elpa :after (add-to-list 'auto-mode-alist '("\\.ronn\\'" . markdown-mode))) (:name nginx-mode :type elpa @@ -113,15 +115,19 @@ (el-get 'sync '(el-get ;; Minor modes dtrt-indent - smart-tabs-mode page-break-lines + smart-tabs-mode ;; Major modes - apel flim semi wanderlust + ;;apel flim semi wanderlust ; wanderlust is huge, only use on emailing boxes + ;;nxhtml ; nxhtml is invasive, only enable if actively using + bison-mode + coffee-mode graphviz-dot-mode + haml-mode markdown-mode nginx-mode - ;;nxhtml ; nxhtml is invasive, only enable if actively using php-mode-improved + scss-mode )) |