Merge branch 'master' of https://github.com/seagle0128/.emacs.d

seagle0128 · Mar 30, 2016 · fd331d5 · fd331d5
2 parents bb4200a + 64774a7
commit fd331d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lisp/init-diminish.el b/lisp/init-diminish.el
@@ -43,6 +43,7 @@
 (eval-after-load "eldoc" '(diminish 'eldoc-mode))
 (eval-after-load "highlight-indentation" '(diminish 'highlight-indentation-current-column-mode))
 (eval-after-load "highlight-symbol" '(diminish 'highlight-symbol-mode))
+(eval-after-load "org-indent" '(diminish 'org-indent-mode))
 (eval-after-load "rainbow-mode" '(diminish 'rainbow-mode))
 (eval-after-load "robe" '(diminish 'robe-mode))
 (eval-after-load "smartparens" '(diminish 'smartparens-mode))

diff --git a/lisp/init-yasnippet.el b/lisp/init-yasnippet.el
@@ -32,6 +32,8 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'yasnippet))
+
 (setq yas-verbosity 0)                  ; Suppress messages
 (yas-global-mode 1)
 (autoload 'dropdown-list "dropdown-list" "Dropdown menu interface" t)
@@ -42,4 +44,4 @@
 (provide 'init-yasnippet)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; init-yasnippet.el ends here
+;;; init-yasnippet.el ends here