[Emacs] Don't load org-tempo in main org block

This commit is contained in:
Ivan Malison 2018-07-06 10:40:44 -07:00
parent cd6f8ce934
commit 13a1e642dc
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8

View File

@ -2780,7 +2780,7 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
haskell-interactive-popup-errors nil haskell-interactive-popup-errors nil
;; Better import handling ;; Better import handling
haskell-process-suggest-remove-import-lines t haskell-process-suggest-remove-import-lines t
haskell-process-auto-import-loaded-modules t haskell-process-auto-import-loaded-modules nil
;; Disable haskell-stylish-on-save, as it breaks flycheck highlighting. ;; Disable haskell-stylish-on-save, as it breaks flycheck highlighting.
;; NOTE: May not be true anymore - taksuyu 2015-10-06 ;; NOTE: May not be true anymore - taksuyu 2015-10-06
haskell-stylish-on-save nil haskell-stylish-on-save nil
@ -2948,7 +2948,6 @@ Intero seems to be causing hangs, so it has been disabled
(("C-e" . end-of-visual-line))) (("C-e" . end-of-visual-line)))
:preface :preface
(progn (progn
(require 'org-tempo)
;; XXX: These should probably be moved to config, right? ;; XXX: These should probably be moved to config, right?
(setq org-startup-indented nil (setq org-startup-indented nil
org-startup-folded t org-startup-folded t
@ -3502,6 +3501,12 @@ alphanumeric characters only."
("http" . "\\.\\(jpeg\\|jpg\\|png\\|gif\\|svg\\)\\(\\?.*?\\)?\\'") ("http" . "\\.\\(jpeg\\|jpg\\|png\\|gif\\|svg\\)\\(\\?.*?\\)?\\'")
("https" . "\\.\\(jpeg\\|jpg\\|png\\|gif\\|svg\\)\\(\\?.*?\\)?\\'")))) ("https" . "\\.\\(jpeg\\|jpg\\|png\\|gif\\|svg\\)\\(\\?.*?\\)?\\'"))))
#+END_SRC #+END_SRC
**** Use org-tempo to allow inserting templates using e.g. <s
#+begin_src emacs-lisp
(use-package org-tempo
:straight nil
:after org)
#+end_src
**** org-projectile **** org-projectile
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package org-projectile (use-package org-projectile