[elpa] externals/org ed8cd9c 1/2: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit ed8cd9cf21c0d68c1f52adb79318efe9da1bacc4
Merge: c212b7d 8ab1e30
Author: Bastien Guerry <bzg@gnu.org>
Commit: Bastien Guerry <bzg@gnu.org>

    Merge branch 'maint'
---
 contrib/lisp/ox-rss.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index 53f341b..f8fcda2 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -245,7 +245,7 @@ communication channel."
                        (or (org-element-property :CATEGORY headline) "") info))
             (pubdate0 (org-element-property :PUBDATE headline))
             (pubdate (let ((system-time-locale "C"))
-                       (if pubdate0
+                       (if (and pubdate0 (not (string-empty-p pubdate0)))
                            (format-time-string
                             "%a, %d %b %Y %H:%M:%S %z"
                             (org-time-string-to-time pubdate0)))))
@@ -270,7 +270,7 @@ communication channel."
                          (org-element-property :CUSTOM_ID headline)
                          publink)
                      info))))
-       (if (not pubdate0) "" ;; Skip entries with no PUBDATE prop
+       (if (not pubdate) "" ;; Skip entries with no PUBDATE prop
          (format
           (concat
            "<item>\n"