all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dan Nicolaescu <dann@ics.uci.edu>
Cc: 4642@emacsbugs.donarmstrong.com, bug-gnu-emacs <bug-gnu-emacs@gnu.org>
Subject: bug#4642: diff from log-view somtime diffs the wrong file
Date: Mon, 05 Oct 2009 09:44:59 -0400	[thread overview]
Message-ID: <jwvljjqx8iy.fsf-monnier+emacsbugreports@gnu.org> (raw)
In-Reply-To: <200910051243.n95ChutU010935@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Mon, 5 Oct 2009 05:43:57 -0700 (PDT)")

> One way to fix this is to make log-view-diff not call vc-version-diff,
> but vc-diff-internal, like so:

That looks OK.  But we should also either fix vc-version-diff so it
doesn't ignore its `files' argument, or otherwise remove that argument
(which will be a good opportunity to go and fix the other callers).


        Stefan


> --- log-view.el.~1.60.~    2009-10-03 03:20:50.000000000 -0700
> +++ log-view.el            2009-10-04 19:20:58.000000000 -0700
> @@ -496,11 +496,12 @@ changeset that affected the currently co
>          (goto-char end)
>          (log-view-msg-next)
>          (setq to (log-view-current-tag))))
> -    (vc-version-diff
> -     (if log-view-per-file-logs
> -      (list (log-view-current-file))
> -       log-view-vc-fileset)
> -       to fr)))
> +    (vc-diff-internal
> +     t (list log-view-vc-backend
> +          (if log-view-per-file-logs
> +               (list (log-view-current-file))
> +                      log-view-vc-fileset))
> +     to fr)))
 
>  (declare-function vc-diff-internal "vc"
>                     (async vc-fileset rev1 rev2 &optional verbose))

> OK to check in?









  reply	other threads:[~2009-10-05 13:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <200910051514.n95FEK5r011964@godzilla.ics.uci.edu>
2009-10-05 12:43 ` bug#4642: diff from log-view somtime diffs the wrong file Dan Nicolaescu
2009-10-05 13:44   ` Stefan Monnier [this message]
2009-10-05 15:20   ` bug#4642: marked as done (diff from log-view somtime diffs the wrong file) Emacs bug Tracking System

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwvljjqx8iy.fsf-monnier+emacsbugreports@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=4642@emacsbugs.donarmstrong.com \
    --cc=bug-gnu-emacs@gnu.org \
    --cc=dann@ics.uci.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.