From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Corwin Brust Newsgroups: gmane.emacs.bugs Subject: bug#67667: wrong phrasing in installation wizard seen in emacs-29.1_2-installer.exe Date: Thu, 11 Jan 2024 02:31:08 -0600 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37046"; mail-complaints-to="usenet@ciao.gmane.io" Cc: sebboh@the-good-guys.net, 67667@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 11 09:32:25 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rNqUC-0009Ol-Aj for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Jan 2024 09:32:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNqTv-0006dg-2e; Thu, 11 Jan 2024 03:32:07 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNqTt-0006dW-K1 for bug-gnu-emacs@gnu.org; Thu, 11 Jan 2024 03:32:05 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNqTt-0007OE-BZ for bug-gnu-emacs@gnu.org; Thu, 11 Jan 2024 03:32:05 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNqTq-00050J-Bh for bug-gnu-emacs@gnu.org; Thu, 11 Jan 2024 03:32:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Corwin Brust Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Jan 2024 08:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67667 X-GNU-PR-Package: emacs Original-Received: via spool by 67667-submit@debbugs.gnu.org id=B67667.170496188618684 (code B ref 67667); Thu, 11 Jan 2024 08:32:02 +0000 Original-Received: (at 67667) by debbugs.gnu.org; 11 Jan 2024 08:31:26 +0000 Original-Received: from localhost ([127.0.0.1]:58688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNqTF-0004qk-Pg for submit@debbugs.gnu.org; Thu, 11 Jan 2024 03:31:26 -0500 Original-Received: from mail-ot1-f47.google.com ([209.85.210.47]:54538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNqTD-0004kr-Hs for 67667@debbugs.gnu.org; Thu, 11 Jan 2024 03:31:24 -0500 Original-Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-6dddf7ea893so1624803a34.1 for <67667@debbugs.gnu.org>; Thu, 11 Jan 2024 00:31:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704961880; x=1705566680; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sWaF5g26vs6AT9G1SNudqXY/FUuF78I+bE+aROKyL/g=; b=E12aHPfsVw/Eob5fLNZ2wo15oBPmb8zoW9o9MIX+j0N9Bj/E+VIbFDKmA14iS6KkbL JNscaVEHCPcDAoElsHvmn8Clt9gDfZMAnSaThWw1r+V5VvxJ6fntvdjLpBvwY4pO2lMw bCstO5nNbpk6LRgbAnwU95SFawg47B1s2iV9F3FPLU/GNODLSnqwlFuXVLRkCz2sOUbt ipKNGQ2mQTOKzF6GZrAYVvVmZopVJVqn8GXbSfcOh0puSy3gP+0yVFCxskbmuyCgiOxl 5EnNR1aU0bf6NArFWuXXQVlFt868Bb/oQJqsK4dXNlUfbEGNzkfw31fYVUDDaXwME0ly 3noQ== X-Gm-Message-State: AOJu0YxUMlHAKmtnVJ8NcoRopWZ2pSJUBmWB83p+C9Kpnewdcgr8VUmt IAn9OEMFDoNl4lbbg9ixfrqbJzEodVhi/v3/bZU= X-Google-Smtp-Source: AGHT+IH5g/+H5ycWCXWvjfykzk/2NYLEcbdI+uEaoohskZJP6cyGLziga7n6V9o9OH4Z3SZfOeuaFcq5LDv5DpNm8E0= X-Received: by 2002:a9d:7a4b:0:b0:6dd:e96c:7f4 with SMTP id z11-20020a9d7a4b000000b006dde96c07f4mr944507otm.47.1704961880290; Thu, 11 Jan 2024 00:31:20 -0800 (PST) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:277874 Archived-At: On Wed, Jan 10, 2024 at 11:54=E2=80=AFAM Corwin Brust wrote= : > > On Wed, Jan 10, 2024 at 11:37=E2=80=AFAM Stefan Kangas wrote: > > > > sebboh@the-good-guys.net writes: > > > > > This screenshot says it all. http://0x0.st/H3iS.png > > > > > > As I understand it, it is not a requirement of GPLv3 that the user > > > "accept" the "terms" of the "agreement" in order to perform an > > > installation. > > > > > > I recommend removing the "if you accept ..." language and changing th= e > > > "I Agree" button to just "OK" or "Noted...", or "Next". > > > > Corwin, what do you think? > > > > I agree. Let's patch it. > I've taken a first -entirely "functional"- swing. WDYT? This should be a comparable screen-shot to yours, sebboh. https://bru.st/i/emacs-30.0.50-installer-NEW_WjvTInvkeC.png This folder on contains the usual items for a Windows snapshot build unaltered vs rev dc1f18, plus a few more: https://corwin.bru.st/emacs-30/emacs-30-dc1f18 The "extra" items are: emacs-30.0.50-installer-NEW.exe - build with patch applied emacs.patched.nsi - installer script after applying patch 0001_windows_installer_license_verbage.patch - this patch: --- /g/emacs-29/admin/nt/dist-build/emacs.nsi 2023-09-05 03:56:12.381580000 -0500 +++ emacs.nsi 2024-01-11 02:00:31.143091400 -0600 @@ -10,7 +10,7 @@ Var StartMenuFolder -!define MUI_WELCOMEPAGE_TITLE "Emacs" +!define MUI_WELCOMEPAGE_TITLE "Emacs ${EMACS_VERSION} Setup" !define MUI_WELCOMEPAGE_TITLE_3LINES !define MUI_WELCOMEPAGE_TEXT "Welcome to Emacs -- the editor of a lifetime= ." @@ -20,8 +20,11 @@ !insertmacro MUI_PAGE_WELCOME - -!define MUI_LICENSEPAGE_TEXT_TOP "The GNU General Public License" +!define MUI_PAGE_HEADER_TEXT "Emacs is Free Software" +!define MUI_PAGE_HEADER_SUBTEXT "A component of the GNU operating system." +!define MUI_LICENSEPAGE_TEXT_TOP "This program is free software." +!define MUI_LICENSEPAGE_TEXT_BOTTOM "You can redistribute this program and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License (as above), or (at your option) any later version." +!define MUI_LICENSEPAGE_BUTTON "OK" !insertmacro MUI_PAGE_LICENSE "emacs-${VERSION_BRANCH}\share\emacs\${EMACS_VERSION}\lisp\COPYING" !insertmacro MUI_PAGE_DIRECTORY