GNU bug report logs - #21851
ediff-patch-file fails if patch-buf is a buffer nameif patch-buf is a buffer name

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 21851 in the body.
You can then email your comments to 21851 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tino Calancha <f92capac <at> gmail.com>
To: kifer <at> cs.stonybrook.edu, bug-gnu-emacs <at> gnu.org
Cc: Tino Calancha <f92capac <at> gmail.com>
Subject: ediff-patch-file fails if patch-buf is a buffer nameif patch-buf
 is a buffer name
Date: Sun, 8 Nov 2015 00:12:03 +0900 (JST)

[Message part 1 (text/plain, inline)]

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-file fails if patch-buf is a buffer name

* lisp/vc/ediff.el (ediff-patch-file)

emacs -Q:
(in *scratch* buffer)

(with-temp-file "/tmp/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"

(epatch nil (get-buffer "patch")) ; ok
(epatch nil "patch") ; BAD
epatch: Wrong type argument: bufferp, "patch"


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

[ediff_1.patch (text/plain, attachment)]

Message #8 received at 21851 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Tino Calancha <f92capac <at> gmail.com>
Cc: 21851 <at> debbugs.gnu.org, kifer <at> cs.stonybrook.edu
Subject: Re: 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

Tino Calancha <f92capac <at> gmail.com> 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

Message #15 received at 21851 <at> debbugs.gnu.org (full text, mbox):

From: Tino Calancha <f92capac <at> gmail.com>
To: Lars Ingebrigtsen <larsi <at> gnus.org>
Cc: Tino Calancha <f92capac <at> gmail.com>, 21851 <at> debbugs.gnu.org,
 kifer <at> cs.stonybrook.edu
Subject: Re: 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)

> 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?

Message #22 received at 21851 <at> debbugs.gnu.org (full text, mbox):

From: Tino Calancha <f92capac <at> gmail.com>
To: 21851 <at> debbugs.gnu.org
Date: Wed, 27 Apr 2016 20:13:27 +0900 (JST)

Hi Lars,

i think this thread should be considered a wish list; the
doc. string doesn't say that PATCH-BUF could be a buffer name:

"If optional PATCH-BUF is given, use the patch in that buffer
and don't ask the user."

So in principle there is nothing wrong if
(epatch nil "buffer-name")
signal an error.  In fact, most of the folks would call this
function interactively, so there would not be issue at all.

*) If we prefer to keep the code as it is, maybe is worth to remark
   in the doc. string the type of PATCH-BUF, someting like:

"If optional arg PATCH-BUF non-nil, then it is a buffer containing
the patch; use that patch and don't ask the user."

*) We may extend this function, so that, PATCH-BUF is a buffer
   or the name of a buffer, like in many others functions in emacs.
   Following patch do that:

diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 71099ab..f9f2370 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1367,7 +1367,9 @@ ediff-patch-file
     (require 'ediff-ptch)
     (setq patch-buf
          (ediff-get-patch-buffer
-          (if arg (prefix-numeric-value arg)) patch-buf))
+          (and arg (prefix-numeric-value arg))
+           (and (or (stringp patch-buf) (bufferp patch-buf))
+                (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))


"GNU Emacs 25.0.93.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.30)
 of 2016-04-27"

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.