[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v |
Date: |
Tue, 22 Jan 2008 23:54:14 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/01/22 23:53:46
Index: lisp/vc-arch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-arch.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- lisp/vc-arch.el 16 Jan 2008 06:22:58 -0000 1.40
+++ lisp/vc-arch.el 22 Jan 2008 23:53:39 -0000 1.41
@@ -347,9 +347,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")))
- [Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v, Dan Nicolaescu, 2008/01/04
- [Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v, Miles Bader, 2008/01/08
- [Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v, Dan Nicolaescu, 2008/01/14
- [Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v, Dan Nicolaescu, 2008/01/16
- [Emacs-diffs] Changes to emacs/lisp/vc-arch.el,v,
Miles Bader <=