From debbugs-submit-bounces@debbugs.gnu.org Wed May 16 15:04:51 2012 Received: (at submit) by debbugs.gnu.org; 16 May 2012 19:04:51 +0000 Received: from localhost ([127.0.0.1]:58058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SUjWk-0000S0-6Y for submit@debbugs.gnu.org; Wed, 16 May 2012 15:04:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54442) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SUjWh-0000Rp-TH for submit@debbugs.gnu.org; Wed, 16 May 2012 15:04:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUjWQ-00031r-8k for submit@debbugs.gnu.org; Wed, 16 May 2012 15:04:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:47627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUjWQ-00031m-3b for submit@debbugs.gnu.org; Wed, 16 May 2012 15:04:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUjWO-0006MN-F9 for bug-gnu-emacs@gnu.org; Wed, 16 May 2012 15:04:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUjWM-00031G-Cj for bug-gnu-emacs@gnu.org; Wed, 16 May 2012 15:04:27 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:36690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUjWM-00030p-3g for bug-gnu-emacs@gnu.org; Wed, 16 May 2012 15:04:26 -0400 Received: by bkcjm19 with SMTP id jm19so176860bkc.0 for ; Wed, 16 May 2012 12:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=ax5++ayLE1HwX5UFLZp7ZaL7IhF5IbikiBX512pE5hg=; b=TE6uB5EZf+UxPDrGmMIaFviB4+iV2MnQgsmDQSqF2rbqX/fQp6Fer9ITxVA2ef3KEf wo7BkN1W52F5prsji7642TUpFuBHt3ljzZXejPBcN5VaSgkbpuWl9MjICthtivr8463z 0DRO6xM26aIQvVxleGBBdlI6GDRn6owTn+jMtziZV0oBnnWbaUWGJwmc4ZX7W27sn/PM s+kieKOOcOWnl+97mjpCDv2GcEBRJwNKWGX0ypv3uB5v01Xml1dfSatUPieyenNm/T5r DPpGFwd6GX4rERaWniv/KBVPGjGbIxnVzrundXa8i8DFj/EjV/5dUQM3UkBnoWayaIMF gFTw== MIME-Version: 1.0 Received: by 10.205.132.13 with SMTP id hs13mr1692861bkc.78.1337195063488; Wed, 16 May 2012 12:04:23 -0700 (PDT) Received: by 10.204.35.145 with HTTP; Wed, 16 May 2012 12:04:23 -0700 (PDT) Date: Wed, 16 May 2012 15:04:23 -0400 Message-ID: Subject: PATCH: Don't kill *vc-diff* on revert. From: "Aaron S. Hawley" To: bug-gnu-emacs Content-Type: text/plain; charset=ISO-8859-1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.1 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.1 (------) When I hit C-x v u in a version controlled file, Emacs shows *vc-diff* asks if you're sure then kills it. I wish it would keep the buffer around in case I want to undo my revert with Diff Mode. Thanks for Emacs, aaron 2012-05-04 Aaron S. Hawley * vc/vc.el (vc-revert, vc-rollback): Just quit *vc-diff* buffer don't kill it when reverting or rolling back. --- vc/vc.el 2012-04-02 19:37:30.000000000 -0400 +++ vc/vc.el 2012-05-04 13:03:18.104977200 -0400 @@ -2303,7 +2303,7 @@ (if (= nfiles 1) "" "s")))))) (error "Revert canceled"))) (when diff-buffer - (quit-windows-on diff-buffer t))) + (quit-windows-on diff-buffer))) (dolist (file files) (message "Reverting %s..." (vc-delistify files)) (vc-revert-file file) @@ -2349,7 +2349,7 @@ ;; Display changes (unless (yes-or-no-p "Discard these revisions? ") (error "Rollback canceled")) - (quit-windows-on "*vc-diff*" t) + (quit-windows-on "*vc-diff*") ;; Do the actual reversions (message "Rolling back %s..." (vc-delistify files)) (with-vc-properties From debbugs-submit-bounces@debbugs.gnu.org Tue May 29 07:44:45 2012 Received: (at 11488) by debbugs.gnu.org; 29 May 2012 11:44:46 +0000 Received: from localhost ([127.0.0.1]:47652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SZKqz-0007Is-Kj for submit@debbugs.gnu.org; Tue, 29 May 2012 07:44:45 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:45263 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SZKqx-0007Il-K5 for 11488@debbugs.gnu.org; Tue, 29 May 2012 07:44:44 -0400 Received: from cm162.gamma80.maxonline.com.sg ([202.156.80.162]:36098 helo=ulysses) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SZKpa-0008Tg-Tc; Tue, 29 May 2012 07:43:19 -0400 From: Chong Yidong To: "Aaron S. Hawley" Subject: Re: bug#11488: PATCH: Don't kill *vc-diff* on revert. References: Date: Tue, 29 May 2012 19:43:14 +0800 In-Reply-To: (Aaron S. Hawley's message of "Wed, 16 May 2012 15:04:23 -0400") Message-ID: <87k3zvfc19.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.97 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: 11488 Cc: 11488@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) "Aaron S. Hawley" writes: > When I hit C-x v u in a version controlled file, Emacs shows *vc-diff* > asks if you're sure then kills it. I wish it would keep the buffer > around in case I want to undo my revert with Diff Mode. Looks good. Committed; thanks. From debbugs-submit-bounces@debbugs.gnu.org Tue May 29 07:44:57 2012 Received: (at control) by debbugs.gnu.org; 29 May 2012 11:44:57 +0000 Received: from localhost ([127.0.0.1]:47655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SZKrA-0007JE-To for submit@debbugs.gnu.org; Tue, 29 May 2012 07:44:57 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:45265 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SZKr9-0007J8-JT for control@debbugs.gnu.org; Tue, 29 May 2012 07:44:55 -0400 Received: from cm162.gamma80.maxonline.com.sg ([202.156.80.162]:36099 helo=ulysses) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SZKpn-0000Jk-V5 for control@debbugs.gnu.org; Tue, 29 May 2012 07:43:32 -0400 From: Chong Yidong To: control@debbugs.gnu.org Subject: close 11488 Date: Tue, 29 May 2012 19:43:27 +0800 Message-ID: <87d35n8b6o.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) close 11488 thanks From unknown Sun Jun 22 03:55:46 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 27 Jun 2012 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator