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#42296: 27.0.91; Correct manual entry for 'concat' w.r.t. allocation [PATCH] Date: Sat, 11 Jul 2020 16:37:17 +0300 Message-ID: <83h7uenpf6.fsf@gnu.org> References: <83wo3cppc5.fsf@gnu.org> <669987BB-B825-4C2C-B9FD-31F04E0D6013@acm.org> <83r1tkplnc.fsf@gnu.org> <83o8oopk4s.fsf@gnu.org> <70B05C00-862D-412B-83DA-7129BF49C322@acm.org> <834kqfp7ir.fsf@gnu.org> <87CAAEDE-4AE2-4224-A3E3-6597E6449B1D@acm.org> <83o8omnu9y.fsf@gnu.org> <1E70112B-0D00-4D94-9696-AA3DE75C9862@acm.org> <83k0zanqsr.fsf@gnu.org> <3B676751-B932-4BD2-8418-C7207F1A52D8@acm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38358"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 42296@debbugs.gnu.org To: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jul 11 15:38:11 2020 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 1juFhi-0009p3-HK for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Jul 2020 15:38:10 +0200 Original-Received: from localhost ([::1]:42808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juFhg-0002DU-Rz for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Jul 2020 09:38:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juFha-0002DM-TS for bug-gnu-emacs@gnu.org; Sat, 11 Jul 2020 09:38:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juFha-0006r6-KO for bug-gnu-emacs@gnu.org; Sat, 11 Jul 2020 09:38:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1juFha-0004Et-Hh for bug-gnu-emacs@gnu.org; Sat, 11 Jul 2020 09:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 11 Jul 2020 13:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42296 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 42296-submit@debbugs.gnu.org id=B42296.159447465516259 (code B ref 42296); Sat, 11 Jul 2020 13:38:02 +0000 Original-Received: (at 42296) by debbugs.gnu.org; 11 Jul 2020 13:37:35 +0000 Original-Received: from localhost ([127.0.0.1]:44038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juFh9-0004EB-Jk for submit@debbugs.gnu.org; Sat, 11 Jul 2020 09:37:35 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:38242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juFh7-0004Dy-Ba for 42296@debbugs.gnu.org; Sat, 11 Jul 2020 09:37:34 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:55715) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juFh1-0006pe-Qc; Sat, 11 Jul 2020 09:37:27 -0400 Original-Received: from [176.228.60.248] (port=2472 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1juFh0-0004Lq-Ql; Sat, 11 Jul 2020 09:37:27 -0400 In-Reply-To: <3B676751-B932-4BD2-8418-C7207F1A52D8@acm.org> (message from Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= on Sat, 11 Jul 2020 15:16:24 +0200) 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" Xref: news.gmane.io gmane.emacs.bugs:182917 Archived-At: > From: Mattias EngdegÄrd > Date: Sat, 11 Jul 2020 15:16:24 +0200 > Cc: 42296-done@debbugs.gnu.org > > Thank you -- correction applied, and result pushed to master (by mistake) and then to emacs-27. Thanks. Next time you have to do something like this, use "git cherry-pick -x" to bring commits from master to the release branch, since that helps merging in the opposite direction (I think the way you did it might cause merge conflicts).