[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
vc bug with cvs head
From: |
Tom Tromey |
Subject: |
vc bug with cvs head |
Date: |
Sun, 04 May 2008 19:10:51 -0600 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) |
I used vc-dir on an svn directory. I updated, then edited a file that
had a conflict. When I saved the file I got the appended.
Part of the problem is that vc-dir-mark-buffer-changed calls things
named client-mode->[...] -- but that doesn't exist.
Simply renaming these to vc-client-object->[...] (random stab at a
fix) does not work.
Also, IMO the buffer-local variable 'client-mode' ought to be renamed
to 'vc-something'.
Tom
(client-mode->file-to-state client-mode)
(apply (client-mode->file-to-state client-mode) fname)
(let* ((file-short ...) (state ...) (extra ...) (entry ...)) (vc-dir-update (\
list entry) status-buf))
(progn (let* (... ... ... ...) (vc-dir-update ... status-buf)))
(if (eq t (compare-strings file nil ... ddir nil nil)) (progn (let* ... ...))\
)
(when (eq t (compare-strings file nil ... ddir nil nil)) (let* (... ... ... .\
..) (vc-dir-update ... status-buf)))
(let ((ddir ...)) (when (eq t ...) (let* ... ...)))
(progn (setq found-vc-dir-buf t) (let (...) (when ... ...)))
(if (eq major-mode (quote vc-dir-mode)) (progn (setq found-vc-dir-buf t) (let\
... ...)))
(when (eq major-mode (quote vc-dir-mode)) (setq found-vc-dir-buf t) (let (...\
) (when ... ...)))
(while --dolist-tail-- (setq status-buf (car --dolist-tail--)) (set-buffer st\
atus-buf) (when (eq major-mode ...) (setq found-vc-dir-buf t) (let ... ...)) (s\
etq --dolist-tail-- (cdr --dolist-tail--)))
(let ((--dolist-tail-- ...) status-buf) (while --dolist-tail-- (setq status-b\
uf ...) (set-buffer status-buf) (when ... ... ...) (setq --dolist-tail-- ...)))
(dolist (status-buf (buffer-list)) (set-buffer status-buf) (when (eq major-mo\
de ...) (setq found-vc-dir-buf t) (let ... ...)))
(save-excursion (dolist (status-buf ...) (set-buffer status-buf) (when ... ..\
. ...)) (unless found-vc-dir-buf (remove-hook ... ...)))
(let* ((file ...) (found-vc-dir-buf nil)) (save-excursion (dolist ... ... ...\
) (unless found-vc-dir-buf ...)))
vc-dir-mark-buffer-changed()
run-hooks(after-save-hook)
basic-save-buffer()
save-buffer(1)
call-interactively(save-buffer nil nil)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- vc bug with cvs head,
Tom Tromey <=