diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-08-13 19:02:27 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-08-13 19:02:27 +0200 |
commit | 548b07741be0a218a0c0b6f7e64965ec0bb296ec (patch) | |
tree | 779eeaf0e4f4a53a6018887fdecd2abc038e3510 | |
parent | 940c90ec97c325ac4b5efd64a408e051a2489ad8 (diff) | |
parent | b862c24b9fb2591dc6240bfbd3a9829c72d9b970 (diff) | |
download | org-mode-548b07741be0a218a0c0b6f7e64965ec0bb296ec.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ob-core.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 72e371b..3d28c06 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1759,16 +1759,20 @@ NAME, or nil if no such block exists. Set match data according to `org-babel-named-src-block-regexp'." (save-excursion (goto-char (point-min)) - (ignore-errors - (org-next-block 1 nil (org-babel-named-src-block-regexp-for-name name))))) + (let ((regexp (org-babel-named-src-block-regexp-for-name name))) + (or (and (looking-at regexp) + (progn (goto-char (match-beginning 1)) + (line-beginning-position))) + (ignore-errors (org-next-block 1 nil)))))) (defun org-babel-src-block-names (&optional file) "Returns the names of source blocks in FILE or the current buffer." (when file (find-file file)) (save-excursion (goto-char (point-min)) - (let ((re (org-babel-named-src-block-regexp-for-name)) - names) + (let* ((re (org-babel-named-src-block-regexp-for-name)) + (names (and (looking-at re) + (list (match-string-no-properties 9))))) (while (ignore-errors (org-next-block 1 nil re)) (push (match-string-no-properties 9) names)) names))) |