From 1e6ca2765fc31671a084d04e99d875ecdc635c3c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 25 Mar 2021 19:22:55 +0200 Subject: [PATCH 1/6] ; * admin/make-tarball.txt: Another minor addition. --- admin/make-tarball.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 65c6e86b1df..2268579f152 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -247,8 +247,12 @@ General steps (for each step, check for possible errors): because replies that invariably are not announcements also get sent out as if they were.) -12. After a release, update the Emacs pages as below. +12. After a release, update the Emacs pages as described below. +13. Bump the Emacs version on the release branch. + If the released version was XX.Y, use 'set-version' from + admin/admin.el to bump the version on the release branch to + XX.Y.50. Commit the changes. UPDATING THE EMACS WEB PAGES AFTER A RELEASE From fdec444758ce6bc22847980a0f421c1fac04fa15 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 25 Mar 2021 18:52:44 +0100 Subject: [PATCH 2/6] ; * etc/NEWS: Fix typo. --- etc/NEWS | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index e79a9d0120d..8226ad3d1da 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -999,7 +999,6 @@ the entire list as before. An integer value limits the list length *** 'vc-git-stash' is now bound to 'C' in the stash headers. --- *** Some stash keybindings are now available in the stash button. 'vc-git-stash' and 'vc-git-stash-snapshot' can now be run using 'C' and 'S' respectively, including when there are no stashes. From 0d7e2a993e791d0a39e2c2d7e20279bebb8b418d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 25 Mar 2021 11:23:17 -0700 Subject: [PATCH 3/6] admin.el fix for bug#47394 * admin/admin.el (manual-html-fix-index-2): Handle Texinfo 6.7. --- admin/admin.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/admin.el b/admin/admin.el index fa96b7e5cac..9be6f4a6071 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -545,7 +545,7 @@ Leave point after the table." (forward-line 1) (while (not done) (cond ((re-search-forward "\\)\ -:  ]*>\\(.*\\)" (line-end-position) t) +:?  ]*>\\(.*\\)" (line-end-position) t) (replace-match (format "\\1\n\\2" (if table-workaround " bgcolor=\"white\"" ""))) From 38b127d32efe39e4ffb2bdd9d43e9f3c517afd8f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 25 Mar 2021 11:48:13 -0700 Subject: [PATCH 4/6] * admin/admin.el (set-version): Handle malformed NEWS markup. --- admin/admin.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/admin.el b/admin/admin.el index 9be6f4a6071..d75612cb51f 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -151,7 +151,7 @@ Root must be the root of an Emacs source tree." (display-warning 'admin "NEWS file contains empty sections - remove them?")) (goto-char (point-min)) - (if (re-search-forward "^\\(\\+\\+\\+ *$\\|--- *$\\|Temporary note:\\)" nil t) + (if (re-search-forward "^\\(\\+\\+\\+? *$\\|---? *$\\|Temporary note:\\)" nil t) (display-warning 'admin "NEWS file still contains temporary markup. Documentation changes might not have been completed!")))) From bf6442fafddf7228362975bd16286c68ee5ce85b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 26 Mar 2021 09:37:56 +0300 Subject: [PATCH 5/6] ; * admin/make-tarball.txt: Minor addition to the Web pages section. --- admin/make-tarball.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 2268579f152..fd63b7501b9 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -272,5 +272,14 @@ page for about a month, then comment it again. Regenerate the various manuals in manual/. The scripts admin/make-manuals and admin/upload-manuals summarize the process. +If you have Texinfo installed locally, make-manuals might fail if it +cannot find epsf.tex. In that case define in the environment + + TEXINPUTS=:/path/to/texinfo-tree/doc + +where /path/to/texinfo-tree is the absolute file name of the top-level +directory where you have the Texinfo source tree. Then re-run +make-manuals. + Browsing is one way to check for any files that still need updating. From bcc4cc3362fdb0f2b299087af5e7b31b92862fbb Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 28 Mar 2021 16:26:21 +0300 Subject: [PATCH 6/6] Doc fixes for 'face-foreground' and 'face-background'. * lisp/faces.el (face-foreground, face-background): Clarify how a face specified in INHERIT arg is used. (Bug#47437) --- lisp/faces.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 1813f8f7365..794343e88a9 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -503,7 +503,8 @@ If INHERIT is t, and FACE doesn't define a foreground color, then any foreground color that FACE inherits through its `:inherit' attribute is considered as well; however the return value may still be nil. If INHERIT is a face or a list of faces, then it is used to try to - resolve an unspecified foreground color. + resolve an unspecified foreground color, in addition to using any +inherited color. To ensure that a valid color is always returned, use a value of `default' for INHERIT; this will resolve any unspecified values by @@ -523,7 +524,8 @@ If INHERIT is t, and FACE doesn't define a background color, then any background color that FACE inherits through its `:inherit' attribute is considered as well; however the return value may still be nil. If INHERIT is a face or a list of faces, then it is used to try to - resolve an unspecified background color. + resolve an unspecified background color, in addition to using any +inherited color. To ensure that a valid color is always returned, use a value of `default' for INHERIT; this will resolve any unspecified values by