From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#68375: 29.1; lispref documentation fixes Date: Thu, 11 Jan 2024 18:45:56 +0200 Message-ID: <837ckflsxn.fsf@gnu.org> References: <87wmsgztk8.fsf@debian-hx90.lan> <83wmsgkv05.fsf@gnu.org> <87edeogf24.fsf@gmx.net> <83il3zly84.fsf@gnu.org> <8734v3sxt3.fsf@gmx.net> <83cyu7lwaq.fsf@gnu.org> <87wmsfrfij.fsf@gmx.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15158"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 68375@debbugs.gnu.org, manphiz@gmail.com To: Stephen Berman Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 11 17:48:12 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 1rNyDz-0003cs-E2 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Jan 2024 17:48:11 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNyCz-00079l-WA; Thu, 11 Jan 2024 11:47:10 -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 1rNyCv-00074j-BZ for bug-gnu-emacs@gnu.org; Thu, 11 Jan 2024 11:47:06 -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 1rNyCv-0003lv-3a for bug-gnu-emacs@gnu.org; Thu, 11 Jan 2024 11:47:05 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNyCs-0006go-Hb for bug-gnu-emacs@gnu.org; Thu, 11 Jan 2024 11:47:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Jan 2024 16:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68375 X-GNU-PR-Package: emacs Original-Received: via spool by 68375-submit@debbugs.gnu.org id=B68375.170499160325356 (code B ref 68375); Thu, 11 Jan 2024 16:47:02 +0000 Original-Received: (at 68375) by debbugs.gnu.org; 11 Jan 2024 16:46:43 +0000 Original-Received: from localhost ([127.0.0.1]:33711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNyCY-0006aY-BW for submit@debbugs.gnu.org; Thu, 11 Jan 2024 11:46:42 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNyCW-0006V6-19 for 68375@debbugs.gnu.org; Thu, 11 Jan 2024 11:46:41 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNyCR-0003XZ-Vy; Thu, 11 Jan 2024 11:46:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=HjORP4i/ONgkYRbllsU/BVUNgW6AeM122rYh9gDKngc=; b=Q2QKZ6n694l1 HeahTYgtQMQ778Yg2oqFiQeuuEji/mqq6fvtHTi/b7YfZ29uLUo6G2WFElp4+9WC0gP/8Ehm7Fkg8 nnD2ICHIDS8kv2SFKQWxXMcJXGkkc7mk9tuoRVP57B1Z7NGXCyKsHa9Z0kSAIxH3uZZhwU54zCVZS X/O5LiBMjJmO6FtVjDuUqFYy7iG+vWlcBDHWTIBB9F0cDKNct+x51BFlZQ8fXfIlN0ztAIc/DexwM ZK+r6gTjEPiqFtAae9VU+OyRtr2WUBFg+qffOeBfkBVZQSTR0t2wdTMPsq3CIMdw7lMH5QJZM0476 11iCfttSQM+PZWXgXcOBtQ==; In-Reply-To: <87wmsfrfij.fsf@gmx.net> (message from Stephen Berman on Thu, 11 Jan 2024 17:39:16 +0100) 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:277918 Archived-At: > From: Stephen Berman > Cc: 68375@debbugs.gnu.org, manphiz@gmail.com > Date: Thu, 11 Jan 2024 17:39:16 +0100 > > On Thu, 11 Jan 2024 17:33:17 +0200 Eli Zaretskii wrote: > > >> From: Stephen Berman > >> Cc: 68375@debbugs.gnu.org, manphiz@gmail.com > >> Date: Thu, 11 Jan 2024 16:18:48 +0100 > [...] > >> >> I thought I'd save you some work by installing the patch myself, > >> >> which I just did, but unfortunately to master instead of emacs-29 > >> >> (and also forgot to add the bug number). Should I revert it and > >> >> install to the release branch? Sorry for the trouble. > >> > > >> > You could have simply cherry-picked it to emacs-29. > >> > >> Is it possible to do that with VC? > > > > No, not that I know of. > > Pity. > > >> I didn't find the term in the source code, only in > >> admin/notes/git-workflow, which only shows the git command (and says > >> to "add 'Backport:' to the commit string", which is another > >> attention block I could well stumble over...). > > > > If you cherry-pick with the -x option, gitmerge.el will recognize the > > cherry-picks automatically, and there's no need for the "backport" > > indication. > > Ah, ok. But then shouldn't that directive be removed from the text, > since the example invocation has the -x option? Maybe. It does no harm, though.