Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2016-12-30 19:35:29 -08:00
commit b37c896630
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8

View File

@ -1672,7 +1672,9 @@ https://github.com/alpaker/Fill-Column-Indicator/issues/21 for more details
;; the time of load-theme ;; the time of load-theme
(defun imalison:set-highlight-indent-guides-faces-load-theme (&rest args) (defun imalison:set-highlight-indent-guides-faces-load-theme (&rest args)
(if (face-background 'default) (if (face-background 'default)
(imalison:set-highlight-indent-guides-faces) (progn
(require 'highlight-indent-guides)
(imalison:set-highlight-indent-guides-faces))
(run-at-time "1 sec" nil 'imalison:set-highlight-indent-guides-faces-load-theme))) (run-at-time "1 sec" nil 'imalison:set-highlight-indent-guides-faces-load-theme)))
(advice-add 'load-theme (advice-add 'load-theme
@ -2504,6 +2506,10 @@ Reduce indentation for some functions
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package eros (use-package eros
:commands (eros-mode) :commands (eros-mode)
:config
(progn
(advice-add 'eval-defun :around 'eros-around-eval-defun)
(advice-add 'eval-last-sexp :around 'eros-around-eval-last-sexp))
:preface :preface
(progn (progn
(defun eros-around-eval-last-sexp (fn &rest args) (defun eros-around-eval-last-sexp (fn &rest args)
@ -2516,9 +2522,6 @@ Reduce indentation for some functions
(end-of-defun) (end-of-defun)
(point)))) (point))))
(advice-add 'eval-defun :around 'eros-around-eval-defun)
(advice-add 'eval-last-sexp :around 'eros-around-eval-last-sexp)
(add-hook 'emacs-lisp-mode-hook 'eros-mode))) (add-hook 'emacs-lisp-mode-hook 'eros-mode)))
#+END_SRC #+END_SRC
**** Reevalute defvars when running eval-last-sexp **** Reevalute defvars when running eval-last-sexp