mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-25 07:27:57 +00:00
Code

Check format of org-structure-template-alist

Browse Source 
* 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
This commit is contained in:
Rasmus 2018-05-27 14:44:49 +02:00
parent dac180ea0d
commit 7ac46c52b7
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-tempo.el
View File

@ -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)))

30
lisp/org.el
View File

@ -11727,6 +11727,35 @@ 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))))
(when elm
(org-display-warning
(format "
Please update the entries of `%s'.
In Org 9.2 the format was changed from something like
(\"s\" \"#+BEGIN_SRC ?\\n#+END_SRC\")
to something like
(\"s\" . \"src\")
Please refer to the documentation of `org-structure-template-alist'.
The following entries must be updated:
%s"
(or checklist 'org-structure-template-alist)
(pp-to-string elm))))))
(defun org--insert-structure-template-mks ()
"Present `org-structure-template-alist' with `org-mks'.
@ -11734,6 +11763,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"))))