Merge branch 'master' of orgmode.org:org-mode

lisp/ob-lob.el

@@ -47,7 +47,7 @@ To add files to this list use the `org-babel-lob-ingest' command."
 (defun org-babel-lob-ingest (&optional file)
   "Add all named source-blocks defined in FILE to
 `org-babel-library-of-babel'."
-  (interactive "f")
+  (interactive "fFile: ")
   (let ((lob-ingest-count 0))
     (org-babel-map-src-blocks file
       (let* ((info (org-babel-get-src-block-info 'light))

lisp/ob-ref.el

@@ -84,6 +84,7 @@ the variable."
 (defvar org-babel-library-of-babel)
 (defun org-babel-ref-resolve (ref)
   "Resolve the reference REF and return its value."
+  (save-window-excursion
   (save-excursion
     (let ((case-fold-search t)
           type args new-refere new-header-args new-referent result
@@ -156,7 +157,7 @@ the variable."
 	    (format "%S" result)
 	  (if (and index (listp result))
 	      (org-babel-ref-index-list index result)
-	    result))))))
+	    result)))))))
 
 (defun org-babel-ref-index-list (index lis)
   "Return the subset of LIS indexed by INDEX.