[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin de56f9a 095/439: Mark merge point of company.
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin de56f9a 095/439: Mark merge point of company. |
Date: |
Sun, 17 Oct 2021 15:47:40 -0400 (EDT) |
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")
- [nongnu] elpa-admin 3afe3ac 060/439: Use org-mode markup in README and rename it to README.org, (continued)
- [nongnu] elpa-admin 3afe3ac 060/439: Use org-mode markup in README and rename it to README.org, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 49382d4 067/439: Some tweaks to README, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 49fce77 070/439: Rename README to README.rst, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 303f2c9 075/439: * admin/archive-contents.el (batch-make-site-package): New function., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin febff3e 079/439: Make README more up-to-date, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 6ba7e63 077/439: Try to preserve timestamps. Fix ChangeLog generation., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin bffc4a6 090/439: Don't create local branches, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 480283a 089/439: Move check_copyright to the makefile, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 81a6a01 088/439: Fix up scripts to build archive from Git, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 90851ae 086/439: Get "make -k" to go through, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin de56f9a 095/439: Mark merge point of company.,
Philip Kaludercic <=
- [nongnu] elpa-admin efd0702 098/439: Fix generation of package autoloads, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5a664e2 091/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin daf3553 099/439: Sync from ack/master, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b0862f3 103/439: * README: Update with corrected information., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0ed260a 107/439: add :keywords to extra package properties, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 9f93862 109/439: seems to be generally usable, added a README, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8787a52 110/439: more documentation and examples, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e55d6b1 102/439: Sync with yasnippet/master, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 52e4af0 105/439: Add new element to the archive-contents vector, and put, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 524fc02 114/439: updating notes and README text, Philip Kaludercic, 2021/10/17