Merge branch 'maint'

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

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