summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-11-05 00:14:12 +0100
committerBastien Guerry <bzg@altern.org>2013-11-05 00:14:12 +0100
commit3231e14e232fde320a26af904ecf141f305201b7 (patch)
treeca7d3fc3b05dc8ee10cacfbc34aa34f7705f1857
parente63b87a46f4f3b2649a264f24b1114d709426d2a (diff)
parent08d93aa2d5b51e0efd181149a9fe26de81fc3b42 (diff)
downloadorg-mode-3231e14e232fde320a26af904ecf141f305201b7.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/ox-rss.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/lisp/ox-rss.el b/contrib/lisp/ox-rss.el
index a09366d..2de1dbc 100644
--- a/contrib/lisp/ox-rss.el
+++ b/contrib/lisp/ox-rss.el
@@ -242,7 +242,7 @@ communication channel."
(pubdate
(let ((system-time-locale "C"))
(format-time-string
- "%a, %d %h %Y %H:%M:%S %z"
+ "%a, %d %b %Y %H:%M:%S %z"
(org-time-string-to-time
(or (org-element-property :PUBDATE headline)
(error "Missing PUBDATE property"))))))
@@ -315,7 +315,7 @@ as a communication channel."
(author (and (plist-get info :with-author)
(let ((auth (plist-get info :author)))
(and auth (org-export-data auth info)))))
- (date (format-time-string "%a, %d %h %Y %H:%M:%S %z")) ;; RFC 882
+ (date (format-time-string "%a, %d %b %Y %H:%M:%S %z")) ;; RFC 882
(description (org-export-data (plist-get info :description) info))
(lang (plist-get info :language))
(keywords (plist-get info :keywords))