[Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v [EMACS_22_BASE]

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Dan Nicolaescu <dann>   08/01/15 04:37:25

Index: vc-arch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-arch.el,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -b -r1.24.2.4 -r1.24.2.5
--- vc-arch.el  7 Jan 2008 02:44:09 -0000       1.24.2.4
+++ vc-arch.el  15 Jan 2008 04:37:20 -0000      1.24.2.5
@@ -341,9 +341,11 @@
   (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))
+       (unless (re-search-forward "^<<<<<<< " nil t)
            ;; The .rej file is obsolete.
-           (condition-case nil (delete-file rej) (error nil)))))))
+         (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")))