Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[gnu-emacs] / lisp / org / ob-ref.el

diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index 5a3c8ba2e4894521b6ec3b41e8198d5fcbbee47b..3e79592f5a029411465de99b1d1e6c7318387d74 100644 (file)
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -1,6 +1,6 @@
 ;;; ob-ref.el --- org-babel functions for referencing external data
 
-;; Copyright (C) 2009-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
 ;; Authors: Eric Schulte
 ;;      Dan Davison
@@ -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)
@@ -174,7 +176,7 @@ the variable."
            ;;       buffer (marker-buffer id-loc)
            ;;       loc (marker-position id-loc))
            ;; (move-marker id-loc nil)
-           (error "Reference '%s' not found in this buffer" ref))
+           (error "Reference `%s' not found in this buffer" ref))
          (cond
           (lob-info (setq type 'lob))
           (id (setq type 'id))