From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#21852: Ediff 2.81.5 of July 4, 2013; ediff-patch-buffer fails if patch-buf doesn't exists. Date: Sun, 8 Nov 2015 00:21:54 +0900 (JST) Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="1468197610-102867229-1446909714=:11665" X-Trace: ger.gmane.org 1446909623 15044 80.91.229.3 (7 Nov 2015 15:20:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 7 Nov 2015 15:20:23 +0000 (UTC) Cc: Tino Calancha To: kifer@cs.stonybrook.edu, 21852@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 07 16:20:11 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1Zv5Hn-0008Nm-6T for geb-bug-gnu-emacs@m.gmane.org; Sat, 07 Nov 2015 16:20:11 +0100 Original-Received: from localhost ([::1]:44275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5Hm-00051o-Dx for geb-bug-gnu-emacs@m.gmane.org; Sat, 07 Nov 2015 10:20:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5Hj-00050a-04 for bug-gnu-emacs@gnu.org; Sat, 07 Nov 2015 10:20:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zv5Hf-0005yJ-3Q for bug-gnu-emacs@gnu.org; Sat, 07 Nov 2015 10:20:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5Hf-0005yF-0I for bug-gnu-emacs@gnu.org; Sat, 07 Nov 2015 10:20:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Zv5He-0004Cj-HH for bug-gnu-emacs@gnu.org; Sat, 07 Nov 2015 10:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 07 Nov 2015 15:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 21852 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: kifer@cs.stonybrook.edu, bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.144690955316099 (code B ref -1); Sat, 07 Nov 2015 15:20:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Nov 2015 15:19:13 +0000 Original-Received: from localhost ([127.0.0.1]:56978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zv5Gq-0004Bb-P6 for submit@debbugs.gnu.org; Sat, 07 Nov 2015 10:19:13 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:39683) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zv5GW-0004Ar-SC for submit@debbugs.gnu.org; Sat, 07 Nov 2015 10:19:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zv5GW-0005V3-0y for submit@debbugs.gnu.org; Sat, 07 Nov 2015 10:18:52 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:51326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5GV-0005Ut-UT for submit@debbugs.gnu.org; Sat, 07 Nov 2015 10:18:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5GU-0004jl-U4 for bug-gnu-emacs@gnu.org; Sat, 07 Nov 2015 10:18:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zv5GQ-0005R1-1K for bug-gnu-emacs@gnu.org; Sat, 07 Nov 2015 10:18:50 -0500 Original-Received: from calancha-ilc.kek.jp ([130.87.234.234]:36073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zv5GP-0005Qe-OA for bug-gnu-emacs@gnu.org; Sat, 07 Nov 2015 10:18:45 -0500 Original-Received: by calancha-ilc.kek.jp (Postfix, from userid 500) id DCC9A7B3B; Sun, 8 Nov 2015 00:21:54 +0900 (JST) Original-Received: from localhost (localhost [127.0.0.1]) by calancha-ilc.kek.jp (Postfix) with ESMTP id C47CD7525; Sun, 8 Nov 2015 00:21:54 +0900 (JST) X-X-Sender: calancha@calancha-ilc.kek.jp User-Agent: Alpine 2.20 (LRH 67 2015-01-07) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:108534 Archived-At: --1468197610-102867229-1446909714=:11665 Content-Type: text/plain; format=flowed; charset=US-ASCII Congratulations! You may have unearthed a bug in Ediff! Please make a concise and accurate summary of what happened and mail it to the address above. ----------------------------------------------------------- ediff-patch-buffer fails if patch-buf doesn't exists. * lisp/vc/ediff.el (ediff-patch-buffer): Added 'require-match argument on read-buffer call. emacs -Q: (in the *scratch* buffer) (with-current-buffer (generate-new-buffer "buff") (insert "foo bar")) (with-current-buffer (generate-new-buffer "buff2") (insert "foo baz")) ;; call ediff-buffers on "buff" and "buff2" and save the ;; differences in a buffer "patch" M-x epatch-buffer y patch RET buff ; ok M-x epatch-buffer y patch RET buffer ; BAD You have killed a vital Ediff buffer---you must leave Ediff now! Emacs : GNU Emacs 25.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.28) of 2015-11-07 Package: Ediff 2.81.5 of July 4, 2013 --1468197610-102867229-1446909714=:11665 Content-Type: text/plain; charset=US-ASCII; name=ediff_2.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=ediff_2.patch ZGlmZiAtLWdpdCBhL2xpc3AvdmMvZWRpZmYuZWwgYi9saXNwL3ZjL2VkaWZm LmVsDQppbmRleCAzYTJkMWU0Li44NzIzYzE5IDEwMDY0NA0KLS0tIGEvbGlz cC92Yy9lZGlmZi5lbA0KKysrIGIvbGlzcC92Yy9lZGlmZi5lbA0KQEAgLTE0 MDMsNyArMTQwMyw3IEBAIGVkaWZmLXBhdGNoLWJ1ZmZlcg0KICAgIHBhdGNo LWJ1Zg0KICAgIChyZWFkLWJ1ZmZlcg0KICAgICAiV2hpY2ggYnVmZmVyIHRv IHBhdGNoPyAiDQotICAgIChlZGlmZi1vdGhlci1idWZmZXIgcGF0Y2gtYnVm KSkpKQ0KKyAgICAoZWRpZmYtb3RoZXItYnVmZmVyIHBhdGNoLWJ1ZikgJ3Jl cXVpcmUtbWF0Y2gpKSkNCiANCiANCiA7OzsjIyNhdXRvbG9hZA0K --1468197610-102867229-1446909714=:11665--