Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-11-05 00:14:12 +01:00
commit 3231e14e23
1 changed files with 2 additions and 2 deletions

View File

@ -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))