From 4c13d0a1a870a450627ce1d8449a3b7204202250 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sat, 28 Apr 2018 17:29:00 +0200
Subject: [PATCH] Do not load Org Tempo by default

* lisp/org.el (org-modules): Do not load Org Tempo by default.

Org Tempo is a backward compatible substitute for the new expansion
mechanism.  It is only available for either die-hard "<s" users or
power users that need advanced templates.
---
 etc/ORG-NEWS | 14 +++++++++-----
 lisp/org.el  |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index f47e0f1e5..d3f7577aa 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -25,16 +25,20 @@ to use orgalist.el, which you can install from GNU ELPA.
 *** Change in the structure template expansion
 
 Org 9.2 comes with a new template expansion mechanism, combining
-~org-insert-structure-template~ and org-tempo.el, which is loaded by
-default.
+~org-insert-structure-template~ bound to ~C-c C-'~.
 
 If you customized the ~org-structure-template-alist~ option manually,
 you probably need to udpate it, see the docstring for accepted values.
 
-If you need complex templates, look at the ~tempo-define-template~
-function or at solutions like yasnippet.
+If you prefer using previous patterns, e.g. =<s=, you can activate
+them again by requiring Org Tempo library:
 
-If you don't need org-tempo.el, remove it from ~org-modules~.
+: (require 'org-tempo)
+
+or add it to ~org-modules~.
+
+If you need complex templates, look at the ~tempo-define-template~
+function or at solutions like Yasnippet.
 
 *** Change to Noweb expansion
 
diff --git a/lisp/org.el b/lisp/org.el
index c63245663..d17b1a3a5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -682,7 +682,7 @@ After a match, group 1 contains the repeat expression.")
     (org-load-modules-maybe 'force)
     (org-element-cache-reset 'all)))
 
-(defcustom org-modules '(org-w3m org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail org-tempo org-eww)
+(defcustom org-modules '(org-w3m org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail org-eww)
   "Modules that should always be loaded together with org.el.
 
 If a description starts with <C>, the file is not part of Emacs