>From 7ae2fd392aaa5f76f65f4c88a0b1286167d6732a Mon Sep 17 00:00:00 2001
From: Rasmus <address@hidden>
Date: Sun, 27 May 2018 14:44:49 +0200
Subject: [PATCH] Check format of org-structure-template-alist

* org.el (org--check-org-structure-template-alist): New function
  yielding user-error if using old org-structure-template-alist
  format.
  (org--insert-structure-template-mks):
* org-tempo.el (org-tempo-add-templates): Use new function
---
 lisp/org-tempo.el |  2 ++
 lisp/org.el       | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el
index b9a554ff7..a651c7b37 100644
--- a/lisp/org-tempo.el
+++ b/lisp/org-tempo.el
@@ -102,6 +102,8 @@ Tempo templates will be added."
 
 Go through `org-structure-template-alist' and
 `org-tempo-keywords-alist' and update tempo templates."
+  (mapc 'org--check-org-structure-template-alist '(org-structure-template-alist
+						   org-tempo-keywords-alist))
   (let ((keys (org-tempo--keys)))
     ;; Check for duplicated snippet keys and warn if any are found.
     (when (> (length keys) (length (delete-dups keys)))
diff --git a/lisp/org.el b/lisp/org.el
index b05acd78a..c67e91489 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11727,6 +11727,41 @@ block can be inserted by pressing TAB after the string \"<KEY\"."
 		(string :tag "Template")))
   :package-version '(Org . "9.2"))
 
+(defun org--check-org-structure-template-alist (&optional checklist)
+  "Check whether `org-structure-template-alist' is set up correctly.
+In particular, check if the Org 9.2 format is used as opposed to
+previous format.
+"
+  (let* ((elm (cl-remove-if-not (lambda (x) (listp (cdr x)))
+				(or (eval checklist)
+				    org-structure-template-alist)))
+	 (len (length elm))
+	 (maxlen 3)
+	 (resize-mini-windows t)
+	 (message-truncate-lines nil)
+	 (max-mini-window-height 15))
+    (when elm
+      (user-error
+       (mapconcat 'identity
+		  '("Please update the entries of `%s'."
+		    ""
+		    "In Org 9.2 the format was changed from something akin to"
+		    "   (\"s\" \"#+BEGIN_SRC ?\\n#+END_SRC\" "
+		    "to something akin to"
+		    "    (\"s\" . \"src\")"
+		    "See (info \"(org)org-structure-template-alist\")"
+		    ""
+		    "The following entries must be updated:"
+		    ""
+		    "%s"
+		    "%s")
+		  "\n")
+       (or checklist org-structure-template-alist)
+       (pp-to-string (cl-subseq elm 0 (min maxlen len)))
+       (if (> len maxlen)
+	   (format "... And %s other entries" (- len maxlen))
+	 "")))))
+
 (defun org--insert-structure-template-mks ()
   "Present `org-structure-template-alist' with `org-mks'.
 
@@ -11734,6 +11769,7 @@ Menus are added if keys require more than one keystroke.  Tabs
 are added to single key entries when more than one stroke is
 needed.  Keys longer than two characters are reduced to two
 characters."
+  (org--check-org-structure-template-alist)
   (let* (case-fold-search
 	 (templates (append org-structure-template-alist
 			    '(("\t" . "Press TAB, RET or SPC to write block name"))))
-- 
2.17.0