From d0c14a12fd14d9f6992de37fc28e8ebb45055b00 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Dec 2014 09:36:50 +0100 Subject: [PATCH 1/2] ob-core: Tiny fix * lisp/ob-core.el (org-babel-active-location-p): Use appropriate accessor. --- lisp/ob-core.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index eef408fd4..045eb74e0 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -96,7 +96,8 @@ (declare-function org-unescape-code-in-string "org-src" (s)) (declare-function org-table-to-lisp "org-table" (&optional txt)) (declare-function org-reverse-string "org" (string)) -(declare-function org-element-context "org-element" (&optional ELEMENT)) +(declare-function org-element-context "org-element" (&optional element)) +(declare-function org-element-type "org-element" (element)) (defgroup org-babel nil "Code block evaluation and management in `org-mode' documents." @@ -941,7 +942,7 @@ evaluation mechanisms." (defvar org-bracket-link-regexp) (defun org-babel-active-location-p () - (memq (car (save-match-data (org-element-context))) + (memq (org-element-type (save-match-data (org-element-context))) '(babel-call inline-babel-call inline-src-block src-block))) ;;;###autoload From 89a0acc75eda785a92c99efc9b617b89e8327f8b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Dec 2014 09:39:08 +0100 Subject: [PATCH 2/2] ob-core: Source blocks are case-insensitive * lisp/ob-core.el (org-babel-map-src-blocks, org-babel-map-inline-src-blocks): Make sure to ignore case when looking for source blocks. Reported-by: Christopher Genovese --- lisp/ob-core.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 045eb74e0..a6ffcc48b 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -996,7 +996,8 @@ beg-body --------- point at the beginning of the body end-body --------- point at the end of the body" (declare (indent 1)) (let ((tempvar (make-symbol "file"))) - `(let* ((,tempvar ,file) + `(let* ((case-fold-search t) + (,tempvar ,file) (visited-p (or (null ,tempvar) (get-file-buffer (expand-file-name ,tempvar)))) (point (point)) to-be-removed) @@ -1035,7 +1036,8 @@ If FILE is nil evaluate BODY forms on source blocks in current buffer." (declare (indent 1)) (let ((tempvar (make-symbol "file"))) - `(let* ((,tempvar ,file) + `(let* ((case-fold-search t) + (,tempvar ,file) (visited-p (or (null ,tempvar) (get-file-buffer (expand-file-name ,tempvar)))) (point (point)) to-be-removed)