diff options
| author | Bastien <bzg@gnu.org> | 2020-02-03 18:24:35 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2020-02-03 18:24:35 +0100 |
| commit | eace60ad3907b50b1d81cb9f0dbbf903ff1dc8f2 (patch) | |
| tree | 42c273126e71d8e831fd0289562147ceedc71972 | |
| parent | 7d61bc5bcbee6a9b823b430f97821157e3d1f268 (diff) | |
| parent | 298d6332222258316aaa6b74699127eb97073ce2 (diff) | |
| download | org-mode-eace60ad3907b50b1d81cb9f0dbbf903ff1dc8f2.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-src.el | 5 | ||||
| -rw-r--r-- | lisp/org-tempo.el | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el index 139076a..bb1c57c 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -1039,9 +1039,8 @@ name of the sub-editing buffer." (babel-info (and (eq type 'src-block) (org-babel-get-src-block-info 'light))) deactivate-mark) - (when (and (called-interactively-p 'any) - (eq type 'src-block) (not (functionp lang-f))) - (user-error "No such language mode: %s" lang-f)) + (when (and (eq type 'src-block) (not (functionp lang-f))) + (error "No such language mode: %s" lang-f)) (org-src--edit-element element (or edit-buffer-name diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el index 9ae2700..e6171c7 100644 --- a/lisp/org-tempo.el +++ b/lisp/org-tempo.el @@ -122,7 +122,7 @@ Go through `org-structure-template-alist' and (special (member name '("src" "export")))) (tempo-define-template (format "org-%s" (replace-regexp-in-string " " "-" name)) `(,(format "#+begin_%s%s" name (if special " " "")) - ,(when special 'p) '> n '> ,(unless special 'p) n + ,(when special 'p) '> n ,(unless special 'p) n ,(format "#+end_%s" (car (split-string name " "))) >) key |