diff options
| author | Miles Bader <miles@gnu.org> | 2008-01-22 23:53:46 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-01-22 23:53:46 +0000 |
| commit | 1bad168e59601c1c843a38b2962e77b29f497f11 (patch) | |
| tree | 26f29332811458573579bb0b807ff85a8d32b807 /lisp/vc-svn.el | |
| parent | 22f9eb9e4f09de5570ba5ede033b0a8f0973a0e9 (diff) | |
| parent | 645b6388d5bae5304098c1e773694beffc3478e9 (diff) | |
| download | emacs-1bad168e59601c1c843a38b2962e77b29f497f11.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
Diffstat (limited to 'lisp/vc-svn.el')
| -rw-r--r-- | lisp/vc-svn.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 368d9f36166..868680375cb 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -567,8 +567,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS." "Call \"svn resolved\" if the conflict markers have been removed." (save-excursion (goto-char (point-min)) - (if (not (re-search-forward "^<<<<<<< " nil t)) - (vc-svn-command nil 0 buffer-file-name "resolved")))) + (unless (re-search-forward "^<<<<<<< " nil t) + (vc-svn-command nil 0 buffer-file-name "resolved") + ;; Remove the hook so that it is not called multiple times. + (remove-hook 'after-save-hook 'vc-svn-resolve-when-done t)))) ;; Inspired by vc-arch-find-file-hook. (defun vc-svn-find-file-hook () |