From 834f6d100b915110b9584b2656e0dd31525a22d9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 31 Mar 2018 08:51:10 +0200 Subject: [PATCH] org-tempo: Require `org' --- lisp/org-tempo.el | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el index d23754ad6..047c4cb4a 100644 --- a/lisp/org-tempo.el +++ b/lisp/org-tempo.el @@ -40,7 +40,7 @@ (require 'tempo) (require 'cl-lib) -(declare-function org-buffer-list "org" (&optional predicate exclude-tmp)) +(require 'org) (defvar org-structure-template-alist) @@ -156,20 +156,16 @@ didn't succeed." ;; ;; Org Tempo is set up with each new Org buffer and potentially in the ;; current Org buffer. -;; -;; Tempo templates can only be added after Org is loaded as -;; `org-structure-template-alist' must be loaded. (add-hook 'org-mode-hook 'org-tempo-setup) (add-hook 'org-tab-before-tab-emulation-hook 'org-tempo-complete-tag) +(org-tempo-add-templates) + ;; Enable Org Tempo in all open Org buffers. (dolist (b (org-buffer-list 'files)) (with-current-buffer b (org-tempo-setup))) -(eval-after-load 'org - '(org-tempo-add-templates)) - (provide 'org-tempo) ;;; org-tempo.el ends here -- 2.11.4.GIT