Parcourir la source

Revert "ob-table: Fix org-sbe's handling of list arguments"

This reverts commit c9d617b32278c04e114bd7c6375ca53636a005ba.
Nicolas Goaziou il y a 7 ans
Parent
commit
9e70db6bab
2 fichiers modifiés avec 6 ajouts et 34 suppressions
  1. 6 11
      lisp/ob-table.el
  2. 0 23
      testing/lisp/test-ob-table.el

+ 6 - 11
lisp/ob-table.el

@@ -132,17 +132,12 @@ as shown in the example below.
                                  "("
                                  (mapconcat
                                   (lambda (var-spec)
-                                    (cond
-				     ((> (length (cdr var-spec)) 1)
-				      (format "%S='%S"
-					      (car var-spec)
-					      (mapcar #'read (cdr var-spec))))
-				     ((stringp (cadr var-spec))
-				      (format "%S=%s"
-                                              (car var-spec) (cadr var-spec)))
-				     (t
-				      (format "%S=%S"
-                                              (car var-spec) (cadr var-spec)))))
+                                    (if (> (length (cdr var-spec)) 1)
+                                        (format "%S='%S"
+                                                (car var-spec)
+                                                (mapcar #'read (cdr var-spec)))
+                                      (format "%S=%s"
+                                              (car var-spec) (cadr var-spec))))
                                   ',variables ", ")
                                  ")")))))
                    (org-babel-execute-src-block

+ 0 - 23
testing/lisp/test-ob-table.el

@@ -52,29 +52,6 @@
    1
    "#+TBLFM: $2 = '(org-sbe identity (x $$1))"))
 
-(ert-deftest test-ob-table/sbe-list ()
-  "Test that `org-sbe' can correctly handle ranges as lists."
-  (org-test-table-target-expect
-   "
-#+name: concat
-#+begin_src emacs-lisp :eval yes
-  (mapconcat #'identity x \"\")
-#+end_src
-
-| foo | bar | replace |
-"
-   "
-#+name: concat
-#+begin_src emacs-lisp :eval yes
-  (mapconcat #'identity x \"\")
-#+end_src
-
-| foo | bar | foobar |
-"
-   1
-   "#+TBLFM: $3 = '(org-sbe concat (x   (list $1..$2)))"
-   "#+TBLFM: $3 = '(org-sbe concat (x $ (list $1..$2)))"))
-
 (provide 'test-ob-table)
 
 ;;; test-ob-table.el ends here