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#21851: ediff-patch-file fails if patch-buf is a buffer nameif patch-buf is a buffer name Date: Thu, 10 Mar 2016 14:08:24 +0900 (JST) Message-ID: References: <87povo10bv.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Trace: ger.gmane.org 1457586428 14912 80.91.229.3 (10 Mar 2016 05:07:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 10 Mar 2016 05:07:08 +0000 (UTC) Cc: Tino Calancha , 21851@debbugs.gnu.org, kifer@cs.stonybrook.edu To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 10 06:06:59 2016 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 1adsoM-0001mu-2X for geb-bug-gnu-emacs@m.gmane.org; Thu, 10 Mar 2016 06:06:58 +0100 Original-Received: from localhost ([::1]:46264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adsoI-0001eL-8t for geb-bug-gnu-emacs@m.gmane.org; Thu, 10 Mar 2016 00:06:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adsnV-0000lv-UN for bug-gnu-emacs@gnu.org; Thu, 10 Mar 2016 00:06:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adsnS-0005rR-Oh for bug-gnu-emacs@gnu.org; Thu, 10 Mar 2016 00:06:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:45035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adsnS-0005qx-M5 for bug-gnu-emacs@gnu.org; Thu, 10 Mar 2016 00:06:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1adsnS-0001EJ-Bu for bug-gnu-emacs@gnu.org; Thu, 10 Mar 2016 00:06: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: Thu, 10 Mar 2016 05:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21851 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch fixed Original-Received: via spool by 21851-submit@debbugs.gnu.org id=B21851.14575863164671 (code B ref 21851); Thu, 10 Mar 2016 05:06:02 +0000 Original-Received: (at 21851) by debbugs.gnu.org; 10 Mar 2016 05:05:16 +0000 Original-Received: from localhost ([127.0.0.1]:42162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adsmh-0001DH-Vb for submit@debbugs.gnu.org; Thu, 10 Mar 2016 00:05:16 -0500 Original-Received: from calancha-ilc.kek.jp ([130.87.234.234]:59533) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adsmg-0001D2-Ab for 21851@debbugs.gnu.org; Thu, 10 Mar 2016 00:05:14 -0500 Original-Received: by calancha-ilc.kek.jp (Postfix, from userid 500) id DB9EAB496; Thu, 10 Mar 2016 14:08:24 +0900 (JST) Original-Received: from localhost (localhost [127.0.0.1]) by calancha-ilc.kek.jp (Postfix) with ESMTP id B7AC743CE; Thu, 10 Mar 2016 14:08:24 +0900 (JST) X-X-Sender: calancha@calancha-ilc.kek.jp In-Reply-To: <87povo10bv.fsf@gnus.org> User-Agent: Alpine 2.20 (LRH 67 2015-01-07) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:114688 Archived-At: > I don't think that's quite right -- now it'll error out if patch-buf is > a real buffer. > > So I've applied the following instead: > > diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el > index e5e16a1..be4ced9 100644 > --- a/lisp/vc/ediff.el > +++ b/lisp/vc/ediff.el > @@ -1367,7 +1367,8 @@ ediff-patch-file > (require 'ediff-ptch) > (setq patch-buf > (ediff-get-patch-buffer > - (if arg (prefix-numeric-value arg)) patch-buf)) > + (if arg (prefix-numeric-value arg)) > + (get-buffer patch-buf))) > (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch) > ((and (not ediff-patch-default-directory) > (buffer-file-name patch-buf)) > the interactive calls neesome adjust: M-x ediff-patch-file RET ;; signals error: Wrong type argument: stringp, nil The doc. string starts with "Query for a file name ...", it should prompt user for a file in this case, right?