Просмотр исходного кода

ob: more adjustments for new list handling

* lisp/ob-ref.el (org-babel-ref-at-ref-p): Only try to read results as
  a list if at the *beginning* of a list item.
* lisp/ob.el (org-babel-read-result): Only try to read results as a
  list if at the *beginning* of a list item.
Eric Schulte 15 лет назад
Родитель
Сommit
426d4182b3
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      lisp/ob-ref.el
  2. 1 1
      lisp/ob.el

+ 1 - 1
lisp/ob-ref.el

@@ -217,7 +217,7 @@ to \"0:-1\"."
 Return nil if none of the supported reference types are found.
 Return nil if none of the supported reference types are found.
 Supported reference types are tables and source blocks."
 Supported reference types are tables and source blocks."
   (cond ((org-at-table-p) 'table)
   (cond ((org-at-table-p) 'table)
-	((org-in-item-p) 'list)
+	((org-at-item-p) 'list)
         ((looking-at "^[ \t]*#\\+BEGIN_SRC") 'source-block)
         ((looking-at "^[ \t]*#\\+BEGIN_SRC") 'source-block)
         ((looking-at org-bracket-link-regexp) 'file)
         ((looking-at org-bracket-link-regexp) 'file)
         ((looking-at org-babel-result-regexp) 'results-line)))
         ((looking-at org-babel-result-regexp) 'results-line)))

+ 1 - 1
lisp/ob.el

@@ -1363,7 +1363,7 @@ following the source block."
   (let ((case-fold-search t) result-string)
   (let ((case-fold-search t) result-string)
     (cond
     (cond
      ((org-at-table-p) (org-babel-read-table))
      ((org-at-table-p) (org-babel-read-table))
-     ((org-in-item-p) (org-babel-read-list))
+     ((org-at-item-p) (org-babel-read-list))
      ((looking-at org-bracket-link-regexp) (org-babel-read-link))
      ((looking-at org-bracket-link-regexp) (org-babel-read-link))
      ((looking-at org-block-regexp) (org-babel-trim (match-string 4)))
      ((looking-at org-block-regexp) (org-babel-trim (match-string 4)))
      ((looking-at "^[ \t]*: ")
      ((looking-at "^[ \t]*: ")