all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dmitry Gutov <dgutov@yandex.ru>
To: Lars Ingebrigtsen <larsi@gnus.org>, William Xu <william.xwl@gmail.com>
Cc: 11605@debbugs.gnu.org
Subject: bug#11605: 24.1.50; vc-ediff revert annoyance
Date: Fri, 26 Feb 2016 02:38:35 +0200	[thread overview]
Message-ID: <14f8969f-2d5a-e2c3-50e3-5201425be6fd@yandex.ru> (raw)
In-Reply-To: <87twkybos7.fsf@gnus.org>

On 02/24/2016 08:33 AM, Lars Ingebrigtsen wrote:

>> @@ -1815,11 +1815,13 @@ Use BACKEND as the VC backend if specified."
>>  		(delete-file filename))))
>>  	  (vc-mode-line file))
>>  	(message "Checking out %s...done" filename)))
>> -    (let ((result-buf (find-file-noselect filename)))
>> +    (let ((result-buf (or (get-file-buffer filename)
>> +                          (find-file-noselect filename))))

Doesn't find-file-noselect call get-file-buffer anyway?

>>        (with-current-buffer result-buf
>>  	;; Set the parent buffer so that things like
>>  	;; C-x v g, C-x v l, ... etc work.
>> -	(set (make-local-variable 'vc-parent-buffer) filebuf))
>> +	(set (make-local-variable 'vc-parent-buffer) filebuf)
>> +        (revert-buffer nil t))

It seems like this might conflict with other uses of vc-find-revision, 
like vc-revision-other-window. Where the user is allowed to change the 
contents of the returned buffer, and might've done so before we do this 
automatic silent revert.

Maybe do it on ediff's side instead?





  reply	other threads:[~2016-02-26  0:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-02  4:31 bug#11605: 24.1.50; vc-ediff revert annoyance William Xu
2016-02-24  6:33 ` Lars Ingebrigtsen
2016-02-26  0:38   ` Dmitry Gutov [this message]
2016-02-26  6:01     ` Lars Ingebrigtsen
2016-02-26 10:36       ` Dmitry Gutov
2016-02-26  9:38     ` William Xu
2016-02-26 10:10       ` Dmitry Gutov
2019-06-27 15:16     ` Lars Ingebrigtsen

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=14f8969f-2d5a-e2c3-50e3-5201425be6fd@yandex.ru \
    --to=dgutov@yandex.ru \
    --cc=11605@debbugs.gnu.org \
    --cc=larsi@gnus.org \
    --cc=william.xwl@gmail.com \
    /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.