From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Sam Steingold Newsgroups: gmane.emacs.devel Subject: diff-apply-hunk broken Date: Thu, 25 Mar 2004 12:32:23 -0500 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: Reply-To: sds@gnu.org NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: sea.gmane.org 1080241608 6394 80.91.224.253 (25 Mar 2004 19:06:48 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 25 Mar 2004 19:06:48 +0000 (UTC) Cc: monnier@iro.umontreal.ca Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Thu Mar 25 20:06:33 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1B6aBV-0004Qh-00 for ; Thu, 25 Mar 2004 20:06:33 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B6aBU-00084F-00 for ; Thu, 25 Mar 2004 20:06:33 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B6Zl8-0006Sv-UO for emacs-devel@quimby.gnus.org; Thu, 25 Mar 2004 13:39:18 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B6Zcx-0004KB-V0 for emacs-devel@gnu.org; Thu, 25 Mar 2004 13:30:51 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B6ZFS-0005yG-P3 for emacs-devel@gnu.org; Thu, 25 Mar 2004 13:07:06 -0500 Original-Received: from [198.112.236.6] (helo=alphatech.com) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B6YiX-0006GL-Q7; Thu, 25 Mar 2004 12:32:33 -0500 Original-Received: from WINSTEINGOLDLAP (winsteingoldlap-dock.alphatech.com [10.0.19.22]) by alphatech.com (8.12.10/8.12.10) with ESMTP id i2PHWNFN000085; Thu, 25 Mar 2004 12:32:23 -0500 (EST) Original-To: emacs-devel@gnu.org X-Attribution: Sam X-Disclaimer: You should not expect anyone to agree with me. Mail-Copies-To: never User-Agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (windows-nt) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:20925 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20925 GNU Emacs 21.3.50.1 (i386-msvc-nt5.0.2195) of 2004-03-19 on WINSTEINGOLDLAP --with-msvc (12.00) Stefan, it appears that your recent patch broke `diff-apply-hunk': in a modified CVS file, I do C-x v = (vc-diff) and in the resulting *vc-diff* buffer I do C-c C-a (diff-apply-hunk) to reverse the section of the diff: Debugger entered--Lisp error: (buffer-read-only #) delete-region(223236 223574) (save-current-buffer (set-buffer buf) (goto-char (car pos)) (delete-region (car pos) (cdr pos)) (insert (car new))) (with-current-buffer buf (goto-char (car pos)) (delete-region (car pos) (cdr pos)) (insert (car new))) (cond ((null line-offset) (error "Can't find the text to patch")) ((and switched ...) (message "(Nothing done)")) (t (with-current-buffer buf ... ... ...) (set-window-point ... ...) (diff-hunk-status-msg line-offset ... nil) (when diff-advance-after-apply-hunk ...))) (let* ((--rest--45507 ...) (buf ...) (line-offset ...) (pos ...) (old ...) (new ...) (switched ...)) (if --rest--45507 (signal ... ...)) (cond (... ...) (... ...) (t ... ... ... ...))) (progn (let* (... ... ... ... ... ... ...) (if --rest--45507 ...) (cond ... ... ...))) (destructuring-bind (buf line-offset pos old new &optional switched) (diff-find-source-location (not reverse) reverse) (cond (... ...) (... ...) (t ... ... ... ...))) diff-apply-hunk(nil) * call-interactively(diff-apply-hunk) -- Sam Steingold (http://www.podval.org/~sds) running w2k Incorrect time syncronization.