From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: master 92da003: Require that the buffer that we're trying to patch exist Date: Sun, 20 Mar 2016 12:07:44 +0100 Message-ID: References: <20160223050918.2774.26132@vcs.savannah.gnu.org> <87mvpzc2l7.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458472093 808 80.91.229.3 (20 Mar 2016 11:08:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 20 Mar 2016 11:08:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 20 12:08:04 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ahbDH-0006sL-Ql for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 12:08:04 +0100 Original-Received: from localhost ([::1]:52342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahbDG-0008Uq-Q5 for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 07:08:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahbDA-0008Uj-G7 for emacs-devel@gnu.org; Sun, 20 Mar 2016 07:08:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahbD5-0006vf-Bk for emacs-devel@gnu.org; Sun, 20 Mar 2016 07:07:56 -0400 Original-Received: from hermes.netfonds.no ([80.91.224.195]:41584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahbD5-0006vb-56 for emacs-devel@gnu.org; Sun, 20 Mar 2016 07:07:51 -0400 Original-Received: from cm-84.215.1.64.getinternet.no ([84.215.1.64] helo=stories) by hermes.netfonds.no with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.84_2) (envelope-from ) id 1ahbCy-0000cm-Vk; Sun, 20 Mar 2016 12:07:48 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJ1BMVEVZFDV/lbOy0uhfPWKt AABxcZSnvsxOK1dlUn6RorbT7Pxyh6qQsM2q5H/gAAACUUlEQVQ4jX2TwWvbMBTGBevIYaec25NZ Cy07NmvDLoM+mYpeArOK3d2Ka0hOga449zmLoKcNxVSlp8Jg1aljCwy8SzIGDfMfNT3JSZuw7oFl 6/vp+54kMIFHivwPsCwKIbBTyuwrcEBSkBWQHEe/ckgGe74LyL7ElELkgC/Vh/6hFP7LJtA4Pxky WQFQzfik3+S+bPosip8nMQJDs/3tDALXxK+aAdFyYZfBfLtax/8+h9b6ZkmLOkZEoPXJvUqPrVIB ra/bQ86jHFXP1JYm5lkuJB7BwU6WiAXGde09sFpQThxZziJlWXoubjzTr2cAkZl2j/T65X1zI0+s 4ebpUZy0O5UBwcRFfW50siOttpzBRVm0mV22fKWcXJakXlZoffuwBfDJ815YhRRFfc2iTWABMFyM NTbAFNp+wz5A7vQ/ReFAYUx3bO81ULsalQr8LMsp22/BcBmsYdTueIVeGbC6CH4pKAOlXIeHQOYX DZBq7hAzMMzbG4FUx3Zf9VU8R92eUCVtL5C5BeM6Rn21YEOZ65BKJU63PSyZKkU3KlA3XchbJKbF NGdQUgWJMxSEV1eiDLhjuUyuxmjghHMXpnKA7yyR+UdcPwqJEH2OJEpArrBYMtQLLgywZBQpA+jw zYE9V2iBwLTA/A7Pbl99O3AGQXpoMVtrNcLs/Pb8By1GPDQaSdOeDQvOR62zVj+knJv1YmBAmhoS ZkJkvfdC0LBv9DS1AOOy3uBdrbsrGthUDBwwZNBN07PaaZo+GaBcOVL3QWqnOynZmc8Xq/sYmNVf g3sU9QiIWK0AAAAASUVORK5CYII= In-Reply-To: <87mvpzc2l7.fsf@gmx.de> (Michael Albinus's message of "Tue, 15 Mar 2016 14:06:44 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 80.91.224.195 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:201921 Archived-At: Michael Albinus writes: >> - (if arg (prefix-numeric-value arg)) patch-buf)) >> + (if arg (prefix-numeric-value arg)) >> + (get-buffer patch-buf))) > > This has broken [Tools] -> [Apply Patch] -> [To a File] > > Could you, pls check? How very odd. Looking at the two commit messages, I must have done something wrong. The one from five minutes earlier looks like the correct one... I wonder where the second patch came from... commit 92da003692b894e6dc514e3a56a1861849dcad8c Author: Lars Ingebrigtsen Date: Tue Feb 23 16:09:06 2016 +1100 Require that the buffer that we're trying to patch exist * lisp/vc/ediff.el (ediff-patch-buffer): Require that the buffer that we're trying to patch exist (bug#21852). commit 0d21540646b7272b069aa6909d41978171c9e06c Author: Tino Calancha Date: Tue Feb 23 16:04:06 2016 +1100 Require that the buffer that we're trying to patch exist * lisp/vc/ediff.el (ediff-patch-buffer): Require that the buffer that we're trying to patch exist (bug#21852). -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no