From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.devel Subject: Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29 Date: Sat, 13 Jan 2024 18:12:28 +0100 Message-ID: <87r0ilcg3n.fsf@gmx.net> References: <170514226115.19096.4951628921236684038@vcs2.savannah.gnu.org> <20240113103754.667A6C00227@vcs2.savannah.gnu.org> <87v87xchms.fsf@gmx.net> <831qalgoe3.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24909"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Jan 13 18:13:24 2024 Return-path: Envelope-to: ged-emacs-devel@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 1rOhZU-0006HT-RS for ged-emacs-devel@m.gmane-mx.org; Sat, 13 Jan 2024 18:13:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOhYi-0004qC-9I; Sat, 13 Jan 2024 12:12:36 -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 1rOhYg-0004q1-5e for emacs-devel@gnu.org; Sat, 13 Jan 2024 12:12:34 -0500 Original-Received: from mout.gmx.net ([212.227.17.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOhYd-0007Nd-AJ; Sat, 13 Jan 2024 12:12:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1705165949; x=1705770749; i=stephen.berman@gmx.net; bh=t2MXaMopR75RwXgPcAlzUcGVzfnk2boy3vWAfo6w7Co=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References: Date; b=CmddVdR4OSyX+bUYqwr6BCUTDiwRfYpYdYBXzldxmyqnnLryUBDsM+GNvAG52QyG YoA3P9SIrYRUISvIsiOVM4IhfOLN/QjUy36EMP4kxj8Vh9sdex4XwT2XcInPZjphG LkiVUutlcy7gOaTnGbW2ZVoiHiI1CcrDjBB8B6N3u+6XMrUp42x4ZnWdgzp8ZRiW3 6e3KIBLAdvmxaQT4CiNhzdF05R4jk6oJ4PLhn/bsSMVZmNjuVU0/9ZE20kaTA/G1j /sezig/FVHMjaB1NuBzlWO9QPYZVGe1sfGYpReUAEgbCgG8O9X/esEIC4thv2UUs8 2fRS9kseaaQN+dHgmg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from strobelfs2 ([94.134.196.23]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MG9g4-1rNeoC47gK-00GaYR; Sat, 13 Jan 2024 18:12:29 +0100 In-Reply-To: <831qalgoe3.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 13 Jan 2024 18:59:48 +0200") X-Provags-ID: V03:K1:LebBOjt/E0/tb09PImc3DsD7I0RvFXayLLwAvtbN20lcRYzB4R6 fIzyPLrL6LNai+Doqgw08Dzc4fyNZZFNvFpo8Z+/jstDAG7O3/gZC4cA9Mp0yKG8756JZXG ng9dHi70xTyhIK0HM+s/87ukHvtdTGW1m1ZvGYjDkM1xotaqtovYKqyk6B6r3PCDthYDCtD rAcJxjUATkk5JMbw32f0w== UI-OutboundReport: notjunk:1;M01:P0:af0Hp7WYG24=;12vnMzL2pLMQobQ+2rQicP2PeFg X9UHSTQEhymDePZCXQmD3kSJHvYwGE81iPHgeHrspU8e/M/dWrr7Z9lS4akGjLi3yr00xj71n j8mBJhLwGyCdjSX6ZOsGqL7rW9OpdD+UlCpp+3VWsb9/zed0jWyrKm0kuCk+Bo4J5I5iJFFdl HxkUgGWhSHNfAa/FOLVwKiz5cEfBETNG+epgAymbCNU38vT/5zFZNdGf+0RXhmUas9J+Df/uu DIEL7GlBzdNg4zShYEkb5ttdhgYqBNU6RfMimBbpmRjHO2KGpMpUUU1o6nlQRdhrYIXQ3o71k sbnq6/CQJl/iCEM9n3ZUlkfNp9OgQsNWqPu2KTgyQMdN0yFWr4B78o7JD3KviVkxKiIBCXXrR yPeP/toQT4je/H6iCEOII40ky/+5rRX4WjFQpUXSREZZEWCWgZvKYf/yjVORiKW54bc3MFW0g JlOl7cIuGbkkw7OgRXvHLIlH7ZZm1+DHJSsUXxdA9gjKlvYWw9M8NVxXUxTKFkdeTeC0DdBqB AqVHkiBAp4yfBgLn7nYYZS2igvBi8U7GE9fBucYLKwUo/PP+6xnG9yhQUjgx9oX+bVoiLvHLo qUlqCZ7FWhcgp22qoszTjOodwjUmUHnj2p3Ih5q0WSfSmhC2GvcHvFo9WgC2d+pbRKrWeJs4p yEaxyFus6CLU6tm/h1VjCEBvTdOLhFYbo7bSSLEzgotBX85EYlc9FFGU8c5glqwKe16kYePva wJXF4dQddZc+kz2oHRpvRtb9D8KdGyjNhjYsvYDf88jT/P//vJZVGK/VNo/njDAKCcMb1kJf Received-SPF: pass client-ip=212.227.17.22; envelope-from=stephen.berman@gmx.net; helo=mout.gmx.net X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:314931 Archived-At: On Sat, 13 Jan 2024 18:59:48 +0200 Eli Zaretskii wrote: >> From: Stephen Berman >> Cc: Eli Zaretskii >> Date: Sat, 13 Jan 2024 17:39:23 +0100 >> >> On Sat, 13 Jan 2024 05:37:54 -0500 (EST) Eli Zaretskii w= rote: >> >> > branch: master >> > commit fe7d2bb62fb4a618362ffa787ed1d1a3bda4a4dd >> > Merge: f1736571fa3 26eb9d3a8a6 >> > Author: Eli Zaretskii >> > Commit: Eli Zaretskii >> > >> > ; Merge from origin/emacs-29 >> > >> > The following commit was skipped: >> > >> > 26eb9d3a8a6 Fix typo in lispref "Creating Strings" section >> >> Because of this, the typo stills exists on master. Is this due to my >> having mistakenly committed the change to master and then reverting it >> and committing it to emacs-29? > > I guess so, yes. I wonder how this happened; I didn't mark the commit for skipping as per gitmerge.el. >> Does it now have to be manually installed to master as well? > > Yes, please. Done. Steve Berman