[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin de56f9a 095/357: Mark merge point of company.
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin de56f9a 095/357: Mark merge point of company. |
Date: |
Thu, 10 Dec 2020 18:06:22 -0500 (EST) |
branch: elpa-admin
commit de56f9a361ea902ce1c7dcf1cd378325cfae4d84
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Mark merge point of company.
---
admin/archive-contents.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 072d03f..e2154df 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -413,13 +413,12 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(when maint
(insert (format "<p>Maintainer: %s</p>\n" (archive--quote maint)))))
(archive--insert-repolinks name srcdir mainsrcfile)
- (let ((readme (archive--get-section "Commentary"
- '("README" "README.rst" "README.md"
- "README.org")
- srcdir mainsrcfile)))
- (when readme
- (write-region readme nil (concat name "-readme.txt"))
- (insert "<h2>Full description</h2><pre>\n" (archive--quote readme)
+ (let ((rm (archive--get-section
+ "Commentary" '("README" "README.rst" "README.md" "README.org")
+ srcdir mainsrcfile)))
+ (when rm
+ (write-region rm nil (concat name "-readme.txt"))
+ (insert "<h2>Full description</h2><pre>\n" (archive--quote rm)
"\n</pre>\n")))
(unless (< (length files) 2)
(insert (format "<h2>Old versions</h2><table cellpadding=\"3\"
border=\"1\">\n"))
@@ -431,7 +430,9 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(format-time-string "%Y-%b-%d" (nth 5 attrs))
(archive--html-bytes-format (nth 7 attrs)))))))
(insert "</table>\n"))
- (let ((news (archive--get-section "News" "NEWS" srcdir mainsrcfile)))
+ (let ((news (archive--get-section
+ "News" '("NEWS" "NEWS.rst" "NEWS.md" "NEWS.org")
+ srcdir mainsrcfile)))
(when news
(insert "<h2>News</h2><pre>\n" (archive--quote news) "\n</pre>\n")))
(insert "</body>\n")
- [elpa] elpa-admin dc8ca2b 072/357: Note availability of Melpa packages, (continued)
- [elpa] elpa-admin dc8ca2b 072/357: Note availability of Melpa packages, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e5ad0fa 044/357: Rephrase examples, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 518362a 073/357: Merge pull request #13 from dgutov/master, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin c51af29 058/357: Reorganize repository layout, allowing site installation., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e148a06 052/357: Put quotes `...' around the example function add-word-to-dictionary, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 6ba7e63 077/357: Try to preserve timestamps. Fix ChangeLog generation., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin cd01c51 080/357: Remove the angle brackets, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin febff3e 079/357: Make README more up-to-date, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 73304d8 097/357: Fix up deployment script, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 1d4d089 094/357: Mark merge point of ack-el., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin de56f9a 095/357: Mark merge point of company.,
Stefan Monnier <=
- [elpa] elpa-admin b0862f3 103/357: * README: Update with corrected information., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin d406160 122/357: Merge the two README. Update copyright_exceptions., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e52215f 124/357: first commit, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin c8efad2 096/357: Fix up copyrights and the checking code, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a0b6599 127/357: Subject: Fix up quoting of keywords. Remove leftover support for *-pkg.el., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 833084f 126/357: Add 'packages/web-server/' from commit 'd0b6ae9df6014db2195da0081dc97cc8246f1fda', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 876bb45 128/357: Merge git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 8861b20 138/357: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a3f667f 133/357: Don't allow package-initialize to use ~/.emacs.d, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 60d74f2 136/357: Merge commit 'aecfbcbc10cf03ec94062ac3e590f8118e5a0434', Stefan Monnier, 2020/12/10