vc-revision-other-window problem

vc-revision-other-window problem

[Emanuele Giaquinta]

Hi,

in latest cvs vc-revision-other-window hangs in vc-ensure-vc-buffer
when called for the second time. The problem seems to be the following
code in vc-ensure-vc-buffer

    (while vc-parent-buffer
      (set-buffer vc-parent-buffer))

the first time it is fine because vc-parent-buffer is nil, but, since
vc-revision-other-window calls vc-find-revision which sets
vc-parent-buffer, the second time vc-parent-buffer will have a non nil
value. Hope the diagnosis is correct.

Emanuele Giaquinta

Re: vc-revision-other-window problem

[martin rudalics]

> in latest cvs vc-revision-other-window hangs in vc-ensure-vc-buffer
> when called for the second time. The problem seems to be the following
> code in vc-ensure-vc-buffer
> 
>     (while vc-parent-buffer
>       (set-buffer vc-parent-buffer))
> 
> the first time it is fine because vc-parent-buffer is nil, but, since
> vc-revision-other-window calls vc-find-revision which sets
> vc-parent-buffer, the second time vc-parent-buffer will have a non nil
> value. Hope the diagnosis is correct.

Does it work with the attached patch?

Re: vc-revision-other-window problem

[Emanuele Giaquinta]

On Mon, Dec 17, 2007 at 08:57:35AM +0100, martin rudalics wrote:

>> in latest cvs vc-revision-other-window hangs in vc-ensure-vc-buffer
>> when called for the second time. The problem seems to be the following
>> code in vc-ensure-vc-buffer
>>
>>     (while vc-parent-buffer
>>       (set-buffer vc-parent-buffer))
>>
>> the first time it is fine because vc-parent-buffer is nil, but, since
>> vc-revision-other-window calls vc-find-revision which sets
>> vc-parent-buffer, the second time vc-parent-buffer will have a non nil
>> value. Hope the diagnosis is correct.
>
> Does it work with the attached patch?

Which patch? :)

Re: vc-revision-other-window problem

[martin rudalics]

[-- Attachment #1: Type: text/plain, Size: 72 bytes --]

>>Does it work with the attached patch?
> 
> 
> Which patch? :)

Sorry.

[-- Attachment #2: vc.patch --]
[-- Type: text/plain, Size: 844 bytes --]

*** vc.el.~1.491.~	Sat Dec  8 10:07:04 2007
--- vc.el	Mon Dec 17 08:53:54 2007
***************
*** 1297,1303 ****
    "Make sure that the current buffer visits a version-controlled file."
    (if vc-dired-mode
        (set-buffer (find-file-noselect (dired-get-filename)))
!     (while vc-parent-buffer
        (set-buffer vc-parent-buffer))
      (if (not buffer-file-name)
  	(error "Buffer %s is not associated with a file" (buffer-name))
--- 1297,1304 ----
    "Make sure that the current buffer visits a version-controlled file."
    (if vc-dired-mode
        (set-buffer (find-file-noselect (dired-get-filename)))
!     (while (and vc-parent-buffer
! 		(not (eq vc-parent-buffer (current-buffer))))
        (set-buffer vc-parent-buffer))
      (if (not buffer-file-name)
  	(error "Buffer %s is not associated with a file" (buffer-name))

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: vc-revision-other-window problem

[Emanuele Giaquinta]

On Mon, Dec 17, 2007 at 11:23:16AM +0100, martin rudalics wrote:

>>> Does it work with the attached patch?
>>
>>
>> Which patch? :)
>
> Sorry.

It works, thanks.