From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Kevin Rodgers Newsgroups: gmane.emacs.bugs Subject: Re: vc, diff and scroll window Date: Tue, 13 Jul 2004 17:35:48 -0600 Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Message-ID: <40F471D4.7060809@yahoo.com> References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1089761795 12707 80.91.224.253 (13 Jul 2004 23:36:35 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 13 Jul 2004 23:36:35 +0000 (UTC) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 14 01:36:27 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BkWp0-0004iq-00 for ; Wed, 14 Jul 2004 01:36:26 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BkWrP-0002Fa-69 for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Jul 2004 19:38:55 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BkWrN-0002FV-VV for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2004 19:38:54 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BkWrM-0002FJ-7J for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2004 19:38:53 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BkWrM-0002FG-4r for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2004 19:38:52 -0400 Original-Received: from [216.168.1.22] (helo=trinity.supernews.net) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1BkWoS-0002ii-Ua for bug-gnu-emacs@gnu.org; Tue, 13 Jul 2004 19:35:53 -0400 Original-Received: from mail.fu-berlin.de ([130.133.1.2]:3978) by trinity.supernews.net with esmtp (Exim 4.24; FreeBSD) id 1BkWoR-000ASm-Vy for gnu-emacs-bug@moderators.isc.org; Tue, 13 Jul 2004 23:35:52 +0000 Original-Received: by Mail.FU-Berlin.DE (Exim 4.34) from curry.zedat.fu-berlin.de ([160.45.10.36]) for gnu-emacs-bug@moderators.isc.org with esmtp id <1BkWoK-0007Sc-Vf>; Wed, 14 Jul 2004 01:35:45 +0200 Original-Received: by Curry.ZEDAT.FU-Berlin.DE (Smail3.2.0.98) from news.uni-berlin.de with bsmtp id ; Wed, 14 Jul 2004 01:35:44 +0200 (MEST) Original-To: gnu-emacs-bug@moderators.isc.org Original-Path: not-for-mail Original-Newsgroups: gnu.emacs.bug Original-Lines: 35 X-Orig-X-Trace: news.uni-berlin.de AmAOGfC7eE6balHZzVLtXgrjE24RqcypTstfB7BPiYggIFujc= User-Agent: Mozilla/5.0 (X11; U; SunOS i86pc; en-US; rv:0.9.4.1) Gecko/20020406 Netscape6/6.2.2 X-Accept-Language: en-us X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.bugs:8408 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:8408 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