mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-02-03 18:24:35 +01:00
parent 7d61bc5bcb 298d633222
commit eace60ad39
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org-src.el
View File

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

2
lisp/org-tempo.el
View File

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