浏览代码

Fix interpretation of the :include property as a list of file names

Carsten Dominik 14 年之前
父节点
当前提交
3529be82ef
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      lisp/org-publish.el

+ 6 - 1
lisp/org-publish.el

@@ -471,7 +471,12 @@ matching filenames."
 		 (i (plist-get (cdr prj) :include))
 		 (i (plist-get (cdr prj) :include))
 		 (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$")))
 		 (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$")))
 	    (when (or
 	    (when (or
-		   (and i (string-match i filename))
+		   (and 
+		    i 
+		    (member filename 
+			    (mapcar 
+			     (lambda (file) (expand-file-name file b))
+			     i)))
 		   (and
 		   (and
 		    (not (and e (string-match e filename)))
 		    (not (and e (string-match e filename)))
 		    (string-match xm filename)))
 		    (string-match xm filename)))