From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Lechtenboerger Subject: [PATCH] ox-publish.el: Fix regexp `match' to be non-nil Date: Fri, 22 Sep 2017 11:51:52 +0200 Message-ID: <871smzkqmf.fsf@wi.uni-muenster.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvKdK-0005Xg-7U for emacs-orgmode@gnu.org; Fri, 22 Sep 2017 05:52:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvKdG-0004MD-7K for emacs-orgmode@gnu.org; Fri, 22 Sep 2017 05:52:30 -0400 Received: from zivm-wwu2-1.uni-muenster.de ([128.176.192.5]:44107 helo=zivm-wwu2.uni-muenster.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dvKdF-0004IE-SC for emacs-orgmode@gnu.org; Fri, 22 Sep 2017 05:52:26 -0400 Received: from localhost (D-3140W19.WIWI.UNI-MUENSTER.DE [128.176.158.169]) by udc-mail.uni-muenster.de (Postfix) with ESMTP id C4593207808D for ; Fri, 22 Sep 2017 11:51:52 +0200 (CEST) Received: from user by localhost with local (Exim 4.84_2) (envelope-from ) id 1dvKci-0001Le-Nq for emacs-orgmode@gnu.org; Fri, 22 Sep 2017 11:51:52 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Hi there, recursive publishing fails with base-extension any because a nil regexp is passed. The attached patch fixes this. Best wishes Jens P.S. I did the necessary paperwork (copyright assignment) for Emacs. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-ox-publish.el-Fix-regexp-match-to-be-non-nil.patch >From 6584a78c350016e39c199bb61d203bc12c0c4c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Lechtenb=C3=B6rger?= Date: Fri, 22 Sep 2017 11:30:13 +0200 Subject: [PATCH] ox-publish.el: Fix regexp `match' to be non-nil * lisp/ox-publish.el (org-publish-get-base-files): Make sure `match' is a string (not nil) before calling `directory-files-recursively'. --- lisp/ox-publish.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 753176b..b592bc9 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -435,8 +435,9 @@ This splices all the components into the list." (let* ((base-dir (file-name-as-directory (org-publish-property :base-directory project))) (extension (or (org-publish-property :base-extension project) "org")) - (match (and (not (eq extension 'any)) - (concat "^[^\\.].*\\.\\(" extension "\\)$"))) + (match (or (and (not (eq extension 'any)) + (concat "^[^\\.].*\\.\\(" extension "\\)$")) + "")) (base-files (cl-remove-if #'file-directory-p (if (org-publish-property :recursive project) -- 2.1.4 --=-=-=--