Mercurial > emacs
comparison lisp/vc.el @ 90068:eac554634bfa
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 25 Dec 2004 02:00:25 +0000 |
parents | f2ebccfa87d4 816dc38b1981 |
children | cb67264d6096 |
comparison
equal
deleted
inserted
replaced
90067:b481c5870e10 | 90068:eac554634bfa |
---|---|
2834 files))) | 2834 files))) |
2835 "done" | 2835 "done" |
2836 (pop-to-buffer | 2836 (pop-to-buffer |
2837 (set-buffer (get-buffer-create "*vc*"))) | 2837 (set-buffer (get-buffer-create "*vc*"))) |
2838 (erase-buffer) | 2838 (erase-buffer) |
2839 (insert-file tempfile) | 2839 (insert-file-contents tempfile) |
2840 "failed")) | 2840 "failed")) |
2841 (setq default-directory (file-name-directory changelog)) | 2841 (setq default-directory (file-name-directory changelog)) |
2842 (delete-file tempfile))))) | 2842 (delete-file tempfile))))) |
2843 | 2843 |
2844 ;; Annotate functionality | 2844 ;; Annotate functionality |