From be4819bd578b696a4692cf7cc1b3d52390a65129 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Wed, 2 Apr 2025 13:52:06 -0400 Subject: [PATCH 1/2] Include additional version metadata during Windows install * admin/nt/dist-build/emacs.nsi: Add DisplayIcon, DisplayVersion, and Publisher values to the Uninstall registry key. Copyright-paperwork-exempt: yes --- admin/nt/dist-build/emacs.nsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/nt/dist-build/emacs.nsi b/admin/nt/dist-build/emacs.nsi index 4a5de4f85f9..9239eb07ec7 100644 --- a/admin/nt/dist-build/emacs.nsi +++ b/admin/nt/dist-build/emacs.nsi @@ -72,6 +72,9 @@ Section # add registry key to enable uninstall from control panel WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "GNU Emacs ${VERSION_BRANCH}" + WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$\"$UninstallerPath$\"" + WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${VERSION_BRANCH}" + WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "Free Software Foundation, Inc." WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$UninstallerPath$\"" ;Create shortcuts From b5967dda32dd9091389e30d8aaa46bdf8319d3e8 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 27 Apr 2025 11:59:17 +0800 Subject: [PATCH 2/2] ; * doc/misc/ert.texi (Introduction): Be more Lisp-specific. --- doc/misc/ert.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index fdf2b2b8aaf..bde76d79394 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -134,11 +134,11 @@ package @file{pp.el}): ;; (pp-to-string '('a 'b)) ; same as above @end lisp -The code contained in these comments can be evaluated from time to -time to compare the output with the expected output. ERT formalizes -this and introduces a common convention, which simplifies Emacs -development, since programmers no longer have to manually find and -evaluate such comments. +The Lisp forms contained in these comments can be evaluated from time to +time, e.g. with @kbd{C-x C-e}, to compare the output with the expected +output. ERT formalizes this and introduces a common convention, which +simplifies Emacs development, since programmers no longer have to +manually find and evaluate such comments. An ERT test definition equivalent to the above comments is this: