Merge branch 'maint'

2015-10-24 11:39:09 +02:00 · 2015-10-24 11:39:09 +02:00 · 9508cc4eef
parent 666fd99175 9277e63352
commit 9508cc4eef
1 changed files with 2 additions and 1 deletions
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@ -2551,7 +2551,8 @@ parameters when merging lists."
 	       (setq params (cons pair (assq-delete-all (car pair) params)))))
 	    (:exports
 	     (setq exports (funcall e-merge exports-exclusive-groups
-				    exports (split-string (cdr pair)))))
+				    exports
+				    (split-string (or (cdr pair) "")))))
 	    (:tangle ;; take the latest -- always overwrite
 	     (setq tangle (or (list (cdr pair)) tangle)))
 	    (:noweb