[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
diff-apply-hunk broken
From: |
Sam Steingold |
Subject: |
diff-apply-hunk broken |
Date: |
Thu, 25 Mar 2004 12:32:23 -0500 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3.50 (windows-nt) |
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 #<buffer io.d.~1.204.~>)
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
<http://www.camera.org> <http://www.iris.org.il> <http://www.memri.org/>
<http://www.mideasttruth.com/> <http://www.honestreporting.com>
Incorrect time syncronization.
- diff-apply-hunk broken,
Sam Steingold <=
- Re: diff-apply-hunk broken, Stefan Monnier, 2004/03/25
- Re: diff-apply-hunk broken, Stefan Monnier, 2004/03/28
- Re: diff-apply-hunk broken, Andre Spiegel, 2004/03/29
- Re: diff-apply-hunk broken, Stefan Monnier, 2004/03/29
- Re: diff-apply-hunk broken, Andre Spiegel, 2004/03/30
- Re: diff-apply-hunk broken, Stefan Monnier, 2004/03/30
- Re: diff-apply-hunk broken, Miles Bader, 2004/03/31
Re: diff-apply-hunk broken, Juri Linkov, 2004/03/25