ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2014-01-20 17:16:32 +01:00
parent 80fc5adb58 dde6af3a62
commit e5617b88cb
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ob-exp.el
View File

@ -343,11 +343,12 @@ replaced with its value."
org-babel-exp-code-template org-babel-exp-code-template
`(("lang" . ,(nth 0 info)) `(("lang" . ,(nth 0 info))
("body" . ,(org-escape-code-in-string (nth 1 info))) ("body" . ,(org-escape-code-in-string (nth 1 info)))
("flags" . ,(let ((f (assq :flags (nth 2 info))))
(when f (concat " " (cdr f)))))
,@(mapcar (lambda (pair) ,@(mapcar (lambda (pair)
(cons (substring (symbol-name (car pair)) 1) (cons (substring (symbol-name (car pair)) 1)
(format "%S" (cdr pair)))) (format "%S" (cdr pair))))
(nth 2 info)) (nth 2 info))
("flags" . ,(let ((f (nth 3 info))) (when f (concat " " f))))
("name" . ,(or (nth 4 info) ""))))) ("name" . ,(or (nth 4 info) "")))))
(defun org-babel-exp-results (info type &optional silent hash) (defun org-babel-exp-results (info type &optional silent hash)

9
testing/lisp/test-ob-exp.el
View File

@ -303,6 +303,15 @@ Here is one at the end of a line. =2=
(org-export-execute-babel-code) (org-export-execute-babel-code)
(buffer-string))))) (buffer-string)))))
(ert-deftest ob-export/export-src-block-with-flags ()
"Test exporting a source block with a flag."
(should
(string-match "\\`#\\+BEGIN_SRC emacs-lisp -some-flag$"
(org-test-with-temp-text
"#+BEGIN_SRC emacs-lisp :flags -some-flag\n\(+ 1 1)\n#+END_SRC"
(org-export-execute-babel-code)
(buffer-string)))))
(provide 'test-ob-exp) (provide 'test-ob-exp)
;;; test-ob-exp.el ends here ;;; test-ob-exp.el ends here