Commit 54648b5c authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the

after-save-hook so that it is not called multiple times.

* vc-svn.el (vc-svn-resolve-when-done): Likewise.
parent 7d3169db
2008-01-15 Dan Nicolaescu <dann@ics.uci.edu>
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
after-save-hook so that it is not called multiple times.
* vc-svn.el (vc-svn-resolve-when-done): Likewise.
2008-01-15 Glenn Morris <rgm@gnu.org>
 
* diff-mode.el (diff-end-of-hunk): Revert 2008-01-08 change.
......@@ -341,9 +341,11 @@ Return non-nil if FILE is unchanged."
(save-excursion
(let ((rej (concat buffer-file-name ".rej")))
(when (and buffer-file-name (vc-arch-diff3-rej-p rej))
(if (not (re-search-forward "^<<<<<<< " nil t))
;; The .rej file is obsolete.
(condition-case nil (delete-file rej) (error nil)))))))
(unless (re-search-forward "^<<<<<<< " nil t)
;; The .rej file is obsolete.
(condition-case nil (delete-file rej) (error nil))
;; Remove the hook so that it is not called multiple times.
(remove-hook 'after-save-hook 'vc-arch-delete-rej-if-obsolete t))))))
(defun vc-arch-find-file-hook ()
(let ((rej (concat buffer-file-name ".rej")))
......
......@@ -497,8 +497,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 ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment