Merge branch 'origin-maint'

lisp/ob-exp.el

@@ -168,7 +168,8 @@ this template."
 					      (org-babel-exp-do-export
 					       info 'inline))))
 		      (if code-replacement
-			  (replace-match code-replacement nil nil nil 1)
+			  (progn (replace-match code-replacement nil nil nil 1)
+				 (delete-char 1))
 			(org-babel-examplize-region (match-beginning 1)
 						    (match-end 1))
 			(forward-char 2)))))))

lisp/ob.el

@@ -191,8 +191,8 @@ Returns non-nil if match-data set"
 	(first-line-p (= 1 (line-number-at-pos)))
 	(orig (point)))
     (let ((search-for (cond ((and src-at-0-p first-line-p  "src_"))
-			    (first-line-p "[( \t]src_")
-			    (t "[( \f\t\n\r\v]src_")))
+			    (first-line-p "[[:punct:] \t]src_")
+			    (t "[[:punct:] \f\t\n\r\v]src_")))
 	  (lower-limit (if first-line-p
 			   nil
 			 (- (point-at-bol) 1))))