From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen 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: Tue, 23 Feb 2016 16:07:32 +1100 Message-ID: <87povo10bv.fsf@gnus.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1456204162 19265 80.91.229.3 (23 Feb 2016 05:09:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Feb 2016 05:09:22 +0000 (UTC) Cc: 21851@debbugs.gnu.org, kifer@cs.stonybrook.edu To: Tino Calancha Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 23 06:09:10 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 1aY5Di-0002R2-C2 for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Feb 2016 06:09:10 +0100 Original-Received: from localhost ([::1]:53909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY5Dh-0001TO-NG for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Feb 2016 00:09:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY5Dc-0001Px-Tz for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 00:09:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aY5DZ-0006n8-Og for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 00:09:04 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41696) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY5DZ-0006n4-M8 for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 00:09:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aY5DZ-0004fg-JQ for bug-gnu-emacs@gnu.org; Tue, 23 Feb 2016 00:09:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Feb 2016 05:09:01 +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 Original-Received: via spool by 21851-submit@debbugs.gnu.org id=B21851.145620408217875 (code B ref 21851); Tue, 23 Feb 2016 05:09:01 +0000 Original-Received: (at 21851) by debbugs.gnu.org; 23 Feb 2016 05:08:02 +0000 Original-Received: from localhost ([127.0.0.1]:38820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aY5Cc-0004eE-1n for submit@debbugs.gnu.org; Tue, 23 Feb 2016 00:08:02 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:56018) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aY5Ca-0004dq-NV for 21851@debbugs.gnu.org; Tue, 23 Feb 2016 00:08:00 -0500 Original-Received: from cpe-60-225-211-161.nsw.bigpond.net.au ([60.225.211.161] helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1aY5CC-0000mR-LP; Tue, 23 Feb 2016 06:07:37 +0100 In-Reply-To: (Tino Calancha's message of "Sun, 8 Nov 2015 00:12:03 +0900 (JST)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-MailScanner-ID: 1aY5CC-0000mR-LP MailScanner-NULL-Check: 1456808858.06957@AdNAU0k3RzbenTV2PtvH0Q 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:113519 Archived-At: Tino Calancha writes: > (epatch nil (get-buffer "patch")) ; ok > (epatch nil "patch") ; BAD > epatch: Wrong type argument: bufferp, "patch" [...] > - (if arg (prefix-numeric-value arg)) patch-buf)) > + (if arg (prefix-numeric-value arg)) (and (stringp patch-buf) > + (get-buffer patch-buf)))) 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)) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no