mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs--rel--22

Browse source 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
This commit is contained in:
Miles Bader 2008-01-22 23:53:46 +00:00
commit 1bad168e59
132 changed files with 1042 additions and 893 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/vc-svn.el
View file

@ -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 ()