Mercurial > emacs

comparison lisp/vc-arch.el @ 87903:5d58981e6690

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
author Miles Bader <miles@gnu.org>
date Tue, 22 Jan 2008 23:53:46 +0000
parents 8f1628da223f 316ed7573095
children c70e45a7acfd 2a61c5f918a5
comparison
equal deleted inserted replaced
87902:2080d155f7aa 87903:5d58981e6690
345 (defun vc-arch-delete-rej-if-obsolete () 345 (defun vc-arch-delete-rej-if-obsolete ()
346 "For use in `after-save-hook'." 346 "For use in `after-save-hook'."
347 (save-excursion 347 (save-excursion
348 (let ((rej (concat buffer-file-name ".rej"))) 348 (let ((rej (concat buffer-file-name ".rej")))
349 (when (and buffer-file-name (vc-arch-diff3-rej-p rej)) 349 (when (and buffer-file-name (vc-arch-diff3-rej-p rej))
350 (if (not (re-search-forward "^<<<<<<< " nil t)) 350 (unless (re-search-forward "^<<<<<<< " nil t)
351 ;; The .rej file is obsolete. 351 ;; The .rej file is obsolete.
352 (condition-case nil (delete-file rej) (error nil))))))) 352 (condition-case nil (delete-file rej) (error nil))
353 ;; Remove the hook so that it is not called multiple times.
354 (remove-hook 'after-save-hook 'vc-arch-delete-rej-if-obsolete t))))))
353 355
354 (defun vc-arch-find-file-hook () 356 (defun vc-arch-find-file-hook ()
355 (let ((rej (concat buffer-file-name ".rej"))) 357 (let ((rej (concat buffer-file-name ".rej")))
356 (when (and buffer-file-name (file-exists-p rej)) 358 (when (and buffer-file-name (file-exists-p rej))
357 (if (vc-arch-diff3-rej-p rej) 359 (if (vc-arch-diff3-rej-p rej)