From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.bugs Subject: bug#8927: 24.0.50; Flaw in C-x v u Date: Fri, 24 Jun 2011 05:37:28 -0400 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: dough.gmane.org 1308909409 1949 80.91.229.12 (24 Jun 2011 09:56:49 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 24 Jun 2011 09:56:49 +0000 (UTC) To: 8927@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jun 24 11:56:44 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Qa37x-0001Oe-6m for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Jun 2011 11:56:41 +0200 Original-Received: from localhost ([::1]:56224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa37v-0006pq-Dg for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Jun 2011 05:56:39 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:36075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa2px-0000nY-Oh for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2011 05:38:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa2pv-00048A-KJ for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2011 05:38:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa2pv-00047z-9M for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2011 05:38:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Qa2pt-0004mt-Ur; Fri, 24 Jun 2011 05:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Richard Stallman Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Jun 2011 09:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 8927 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.130890826418377 (code B ref -1); Fri, 24 Jun 2011 09:38:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Jun 2011 09:37:44 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Qa2pb-0004mM-Kf for submit@debbugs.gnu.org; Fri, 24 Jun 2011 05:37:44 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Qa2pY-0004m9-Va for submit@debbugs.gnu.org; Fri, 24 Jun 2011 05:37:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa2pS-000462-GJ for submit@debbugs.gnu.org; Fri, 24 Jun 2011 05:37:35 -0400 Original-Received: from lists.gnu.org ([140.186.70.17]:56239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa2pS-00045y-7a for submit@debbugs.gnu.org; Fri, 24 Jun 2011 05:37:34 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:35992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa2pP-0000eq-Sn for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2011 05:37:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa2pN-00045V-U3 for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2011 05:37:31 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:46911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa2pN-00045R-KM for bug-gnu-emacs@gnu.org; Fri, 24 Jun 2011 05:37:29 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Qa2pM-00042w-5T; Fri, 24 Jun 2011 05:37:28 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 24 Jun 2011 05:38:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org 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 Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:47432 Archived-At: I did C-x v = to see the changes in a file, then reverted the file with C-x v u so I could install and commit those changes one by one. Unfortunately, C-x v u deleted the *vc-diff* buffer and made this fail. C-x v u should not delete the *vc-diff* buffer. In GNU Emacs 24.0.50.1 (mips64el-unknown-linux-gnu, GTK+ Version 2.12.12) of 2011-06-10 on theobromine2 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: en_US.UTF-8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: Mail Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t gpm-mouse-mode: t display-battery-mode: t tooltip-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t abbrev-mode: t Recent input: SPC v SPC - SPC DEL DEL = SPC t o SPC s e e SPC t h e SPC c h a n g e s SPC i n SPC a SPC f i l e , SPC t h e n SPC r e v e r t e d RET t h e SPC f i l e SPC w i t h SPC C - x SPC v SPC u SPC s o SPC I SPC c o u l d SPC i n s t a l l SPC a m d SPC DEL DEL DEL n d SPC c o m m i t SPC t h o s e SPC c h a n g e s RET o n e SPC b y SPC o n e . ESC q RET RET U n f o r t u n a t e l y , SPC C - x SPC v SPC u SPC d e l e t e d SPC t h e SPC * v c - d i f f * SPC b u f f e r SPC a n d SPC m a d e SPC t h i s SPC f a i l . RET RET C - x SPC v SPC u SPC s h o u l d SPC n o t SPC d e l e t e SPC t h e SPC * v c - d i f f * SPC b u f f e r . C-a C-p C-p C-p C-p C-p C-@ C-u C-n C-n C-n ESC w C-x m C-g ESC x r e o o r t DEL DEL DEL DEL p o r t SPC e m a c s TAB RET Recent messages: Quit Mark set There are unresolved conflicts in this file Mark set Saving file /home/rms/emacs-bzr/trunk/lisp/ChangeLog... Wrote /home/rms/emacs-bzr/trunk/lisp/ChangeLog Type C-h for help. Quit [2 times] Auto-saving...done Mark set Quit Load-path shadows: None found. Features: (shadow emacsbug smerge-mode ansi-color diff expect rmailedit mh-e mh-compat mh-acros cl mh-buffers mh-loaddefs gnus gnus-ems nnheader gnus-util time-date wid-edit cal-move cal-menu calendar cal-loaddefs mule-util log-edit pcvs-util add-log parse-time vc-cvs sgml-mode ispell derived byte-opt bytecomp byte-compile cconv macroexp debug compare-w whitespace diff-mode easy-mmode vc ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff vc-dispatcher dired-aux vc-bzr find-func help-fns warnings ind-util rmailout kmacro quail help-mode view dabbrev shell pcomplete grep compile multi-isearch newcomment qp mailalias rmailmm message sendmail format-spec mml mml-sec mm-decode mm-bodies mm-encode mailabbrev gmm-utils mailheader mail-parse rfc2231 rmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils dired t-mouse battery paren cus-start cus-load mailcrypt rfc822 comint regexp-opt ring easymenu mailcrypt-init tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer loaddefs button faces cus-face files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org, www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use free telephony http://directory.fsf.org/category/tel/