unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Sam Steingold <sds@gnu.org>
Cc: monnier@iro.umontreal.ca
Subject: diff-apply-hunk broken
Date: Thu, 25 Mar 2004 12:32:23 -0500	[thread overview]
Message-ID: <uzna4zvbs.fsf@gnu.org> (raw)

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.

             reply	other threads:[~2004-03-25 17:32 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-03-25 17:32 Sam Steingold [this message]
2004-03-25 17:48 ` diff-apply-hunk broken Stefan Monnier
2004-03-28 22:46   ` Stefan Monnier
2004-03-29  8:10     ` Andre Spiegel
2004-03-29 14:19       ` Stefan Monnier
2004-03-30 14:56         ` Andre Spiegel
2004-03-30 23:28           ` Stefan Monnier
2004-03-31 23:08             ` Miles Bader
2004-04-01  6:12               ` Eli Zaretskii
2004-04-01 20:36                 ` Miles Bader
2004-04-01 23:41                 ` Paul Eggert
2004-04-02  7:32                   ` Eli Zaretskii
2004-04-02 23:56                     ` Paul Eggert
2004-04-03  0:45                       ` Stefan Monnier
2004-04-03  1:43                         ` Paul Eggert
2004-04-03  1:48                           ` Stefan Monnier
2004-04-03  6:47                             ` Paul Eggert
2004-04-08  4:23                               ` Juri Linkov
2004-03-25 21:53 ` Juri Linkov
2004-03-25 22:38   ` Sam Steingold
2004-03-27  5:53     ` Richard Stallman
2004-03-26  0:26   ` Kim F. Storm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=uzna4zvbs.fsf@gnu.org \
    --to=sds@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).