vc, diff and scroll window

vc, diff and scroll window

[Matthias Meulien]

In GNU Emacs 21.2.1 (i386-debian-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2002-03-22 on raven, modified by Debian
configured using `configure  i386-debian-linux-gnu --prefix=/usr --sharedstatedir=/var/lib --libexecdir=/usr/lib --localstatedir=/var/lib --infodir=/usr/share/info --mandir=/usr/share/man --with-pop=yes --with-x=yes --with-x-toolkit=athena --without-gif'
Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: nil
  locale-coding-system: nil
  default-enable-multibyte-characters: t

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

Suppose I have a file under version control, and say that that file
has been changed and saved without being commited. When I press C-xvu
(calling vc-revert-buffer) from a buffer visiting that file, the
corresponding window get split a diff buffer is shown and Emacs ask
'Discard changes' (the minibuffer get selected).

Here are two bugs related to this situation:

1. The diff buffer is not fontified.

2. While the minibuffer is selected, M-C-v (scroll-other-window)
   doesn't work, so one cannot scroll the window containing the diff
   buffer.

Thank you for your attention,
-- 
Matthias Meulien

Re: vc, diff and scroll window

[Kevin Rodgers]

Matthias Meulien wrote:
 > Suppose I have a file under version control, and say that that file
 > has been changed and saved without being commited. When I press C-xvu
 > (calling vc-revert-buffer) from a buffer visiting that file, the
 > corresponding window get split a diff buffer is shown and Emacs ask
 > 'Discard changes' (the minibuffer get selected).
 >
 > Here are two bugs related to this situation:
 >
 > 1. The diff buffer is not fontified.

Is it in Diff mode (confirmed via `C-h v major-mode')?

 > 2. While the minibuffer is selected, M-C-v (scroll-other-window)
 >    doesn't work, so one cannot scroll the window containing the diff
 >    buffer.

A simple addition to vc-version-diff should fix that:

*** /usr/local/emacs-21.3/lisp/vc.el.orig	Mon Jan 20 04:03:30 2003
--- /usr/local/emacs-21.3/lisp/vc.el	Tue Jul 13 09:38:15 2004
***************
*** 2500,2505 ****
--- 2500,2506 ----
   	(vc-exec-after `(message nil))
   	(when status
   	  (unwind-protect
+ 	      (setq minibuffer-scroll-window win)
   	      (unless (yes-or-no-p "Discard changes? ")
   		(error "Revert canceled"))
   	    (select-window win)

-- 
Kevin Rodgers

Re: vc, diff and scroll window

[Richard Stallman]

The change seems reasonable technically.  Unfortunately, we've reached
the limit on how much of your code we can install without getting
suitable legal papers from you.