[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] [PATCH] ox-publish.el: Fix regexp `match' to be non-nil
From: |
Jens Lechtenboerger |
Subject: |
[O] [PATCH] ox-publish.el: Fix regexp `match' to be non-nil |
Date: |
Fri, 22 Sep 2017 11:51:52 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
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.
>From 6584a78c350016e39c199bb61d203bc12c0c4c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Lechtenb=C3=B6rger?= <address@hidden>
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
- [O] [PATCH] ox-publish.el: Fix regexp `match' to be non-nil,
Jens Lechtenboerger <=