summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2013-11-12 21:55:53 +0100
committerBastien Guerry <bzg@altern.org>2014-01-24 11:26:39 +0100
commitcaf851d44dd6c8d8338df956b385a5965bae19ca (patch)
tree1f68ac605d279574674c3a3dff48ddb5bfd9a070
parent91940f514e436254336990f9bfc0d25da4528fd0 (diff)
downloadorg-mode-caf851d44dd6c8d8338df956b385a5965bae19ca.tar.gz
ob-ref: Fix "Marker points into wrong buffer" error
* lisp/ob-ref.el (org-babel-ref-parse): If `org-babel-current-src-block-location' is a marker, it can be from another buffer, use marker-position instead in this case. Introduced with r114064 on Emacs trunk. Not sure if this is a bug in Org or Emacs, but the patch restores the previous behaviour.
-rw-r--r--lisp/ob-ref.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index ece99c5..152af86 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -85,7 +85,9 @@ the variable."
(cons (intern var)
(let ((out (save-excursion
(when org-babel-current-src-block-location
- (goto-char org-babel-current-src-block-location))
+ (goto-char (if (markerp org-babel-current-src-block-location)
+ (marker-position org-babel-current-src-block-location)
+ org-babel-current-src-block-location)))
(org-babel-read ref))))
(if (equal out ref)
(if (string-match "^\".*\"$" ref)