From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= 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 15:47:05 +0200 Message-ID: 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> <83h7uenpf6.fsf@gnu.org> Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.14\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39995"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 42296@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jul 11 15:48:12 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 1juFrP-000AJC-Up for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Jul 2020 15:48:11 +0200 Original-Received: from localhost ([::1]:44976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juFrP-0003mo-0q for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 11 Jul 2020 09:48:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juFrG-0003m7-Rb for bug-gnu-emacs@gnu.org; Sat, 11 Jul 2020 09:48:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juFrG-0007pn-J6 for bug-gnu-emacs@gnu.org; Sat, 11 Jul 2020 09:48:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1juFrG-0004TD-HJ for bug-gnu-emacs@gnu.org; Sat, 11 Jul 2020 09:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 11 Jul 2020 13:48: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.159447523717133 (code B ref 42296); Sat, 11 Jul 2020 13:48:02 +0000 Original-Received: (at 42296) by debbugs.gnu.org; 11 Jul 2020 13:47:17 +0000 Original-Received: from localhost ([127.0.0.1]:44044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juFqX-0004SG-G5 for submit@debbugs.gnu.org; Sat, 11 Jul 2020 09:47:17 -0400 Original-Received: from mail1451c50.megamailservers.eu ([91.136.14.51]:60138 helo=mail266c50.megamailservers.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1juFqU-0004S2-TD for 42296@debbugs.gnu.org; Sat, 11 Jul 2020 09:47:15 -0400 X-Authenticated-User: mattiase@bredband.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1594475228; bh=VBC/AmTlg0Gzl2G8xKaTlKo7FBKfed1DbZ6qM1ZsD88=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From; b=aRQZsF2SgDp7rKbXdxRwDbqJfOT2Nw7kADRdzgympyjhaoxNzRPbO8B9eEGY+ZckL sPsXR1EM2O56lN+B3KU8t1kYk5W7rA/6JocCafxrKMfwfbMqGQqnRKeIsMfHEZMJcm jWGWsEh1PUwXbZlhK7nn7CZnlRFQ7MkU8SDffFmE= Feedback-ID: mattiase@acm.or Original-Received: from [192.168.0.4] (c188-150-171-71.bredband.comhem.se [188.150.171.71]) (authenticated bits=0) by mail266c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id 06BDl5Dn005160; Sat, 11 Jul 2020 13:47:07 +0000 In-Reply-To: <83h7uenpf6.fsf@gnu.org> X-Mailer: Apple Mail (2.3445.104.14) X-CTCH-RefID: str=0001.0A782F17.5F09C2DC.0021, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=A5MSwJeG c=1 sm=1 tr=0 a=SF+I6pRkHZhrawxbOkkvaA==:117 a=SF+I6pRkHZhrawxbOkkvaA==:17 a=kj9zAlcOel0A:10 a=M51BFTxLslgA:10 a=mDV3o1hIAAAA:8 a=r9zwD_J3KQMlny5wcqoA:9 a=CjuIK1q_8ugA:10 a=_FVE-zBwftR9WsbkzFJk:22 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:182918 Archived-At: 11 juli 2020 kl. 15.37 skrev Eli Zaretskii : > 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). Understood.