Mercurial > emacs
comparison lisp/vc-arch.el @ 79848:316ed7573095
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Tue, 15 Jan 2008 04:37:20 +0000 |
| parents | 73661ddc7ac7 |
| children | 5d58981e6690 |
comparison
equal
deleted
inserted
replaced
| 79847:1fd2919ac544 | 79848:316ed7573095 |
|---|---|
| 339 (defun vc-arch-delete-rej-if-obsolete () | 339 (defun vc-arch-delete-rej-if-obsolete () |
| 340 "For use in `after-save-hook'." | 340 "For use in `after-save-hook'." |
| 341 (save-excursion | 341 (save-excursion |
| 342 (let ((rej (concat buffer-file-name ".rej"))) | 342 (let ((rej (concat buffer-file-name ".rej"))) |
| 343 (when (and buffer-file-name (vc-arch-diff3-rej-p rej)) | 343 (when (and buffer-file-name (vc-arch-diff3-rej-p rej)) |
| 344 (if (not (re-search-forward "^<<<<<<< " nil t)) | 344 (unless (re-search-forward "^<<<<<<< " nil t) |
| 345 ;; The .rej file is obsolete. | 345 ;; The .rej file is obsolete. |
| 346 (condition-case nil (delete-file rej) (error nil))))))) | 346 (condition-case nil (delete-file rej) (error nil)) |
| 347 ;; Remove the hook so that it is not called multiple times. | |
| 348 (remove-hook 'after-save-hook 'vc-arch-delete-rej-if-obsolete t)))))) | |
| 347 | 349 |
| 348 (defun vc-arch-find-file-hook () | 350 (defun vc-arch-find-file-hook () |
| 349 (let ((rej (concat buffer-file-name ".rej"))) | 351 (let ((rej (concat buffer-file-name ".rej"))) |
| 350 (when (and buffer-file-name (file-exists-p rej)) | 352 (when (and buffer-file-name (file-exists-p rej)) |
| 351 (if (vc-arch-diff3-rej-p rej) | 353 (if (vc-arch-diff3-rej-p rej) |