GNU bug report logs - #68803
[PATCH] Substitute all emacsclient occurrences

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 29 Jan 2024 22:19:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 29 17:19:14 2024
Received: from localhost ([127.0.0.1]:33637 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rUZyE-0007UL-Cw
	for submit <at> debbugs.gnu.org; Mon, 29 Jan 2024 17:19:14 -0500
Received: from lists.gnu.org ([2001:470:142::17]:47838)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <me@HIDDEN>) id 1rUZyC-0007U3-Om
 for submit <at> debbugs.gnu.org; Mon, 29 Jan 2024 17:19:13 -0500
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 <me@HIDDEN>) id 1rUZxy-00010r-Ba
 for bug-gnu-emacs@HIDDEN; Mon, 29 Jan 2024 17:18:58 -0500
Received: from mail.linj.tech ([5.255.109.209])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <me@HIDDEN>) id 1rUZxw-0000b5-3F
 for bug-gnu-emacs@HIDDEN; Mon, 29 Jan 2024 17:18:58 -0500
From: Lin Jian <me@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linj.tech; s=mail;
 t=1706566732; bh=je2jE9MggLeZWuK5Cn2EMVRMfudvS6cwPOjCnKU43RY=;
 h=From:To:Subject:Date;
 b=HT3cC2MNBnVO/y0Nm6Lk6e15Vv8RM4dCbH+DahKxgCwuZBUxFBIMR71hHZZFWuIbM
 2BlaugRTTwLyfA6LNinOR3jN8mIiKK4U9Fv4PoEyvbWYw5wM5M/wJ9ncQeTSNp6ZlT
 9oEXHF7B5HaHBQUncDYVtGiRBqWRjVlCwdxZHMJW5NsqIrfob+e5pWBuf8y1rVEBRP
 FT+fEDvGZIiMw8sdpZa8MnIkQRmT4YrR6e/I6GbaAnjq2RdZF8bh8hcuDtWDA0lxOE
 snaZ/kOX6/V9OFeAhK7lkK8vPDib4LGm6gtz28scKBjc+0ZzuXzguX3XYKKtENQJwY
 KCjNPul284h9A==
To: bug-gnu-emacs@HIDDEN
Subject: [PATCH] Substitute all emacsclient occurrences
Date: Tue, 30 Jan 2024 06:15:51 +0800
Message-ID: <87h6ivye9v.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Received-SPF: pass client-ip=5.255.109.209; envelope-from=me@HIDDEN;
 helo=mail.linj.tech
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

--=-=-=
Content-Type: text/plain

Tags: patch

After commit "From .desktop files, reuse a frame or start a new
Emacs as required" on 2021-06-30, there are two emacsclient
occurrences for the Exec key of etc/emacsclient.desktop.

Before this change, only the first occurrence is substituted.

I propose a patch to substitute all emacsclient occurrences.

In GNU Emacs 29.1 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo
version 1.18.0, Xaw3d scroll bars)
Windowing system distributor 'The X.Org Foundation', version 11.0.12101010
System Description: NixOS 24.05 (Uakari)

Configured using:
 'configure
 --prefix=/nix/store/mzdvpxzkhlryxmbxwbih7bgvkzkw1ly7-emacs-29.1
 --disable-build-details --with-modules --with-x-toolkit=lucid
 --with-xft --with-cairo --with-compress-install
 --with-toolkit-scroll-bars --with-native-compilation
 --without-imagemagick --without-small-ja-dic --with-tree-sitter
 --with-xinput2 --without-xwidgets'


--=-=-=
Content-Type: text/patch
Content-Disposition: attachment;
 filename=0001-Substitute-all-emacsclient-occurrences.patch

From 69ea684a44e1619b3e89a2f2a7189713dfdc03ab Mon Sep 17 00:00:00 2001
From: Lin Jian <me@HIDDEN>
Date: Tue, 30 Jan 2024 06:11:26 +0800
Subject: [PATCH] Substitute all emacsclient occurrences

After commit "From .desktop files, reuse a frame or start a new
Emacs as required" on 2021-06-30, there are two emacsclient
occurrences for the Exec key of etc/emacsclient.desktop.
Before this change, only the first occurrence is substituted.
* Makefile.in (install-etc): Substitute all emacsclient occurrences.

Copyright-paperwork-exempt: yes
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 996f7b8d8c7..069f756bcf8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -844,7 +844,7 @@ install-etc:
 	rm -f $${tmp}
 	tmp=etc/emacsclient.tmpdesktop; rm -f $${tmp}; \
 	client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \
-	sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \
+	sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|g" \
 	  -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
 	  $(USE_STARTUP_NOTIFICATION_SED_CMD) \
 	  $(USE_WAYLAND_DISPLAY_SED_CMD) \
-- 
2.42.0


--=-=-=--