Mercurial > emacs
comparison lisp/vc.el @ 90843:d7172f202ab8
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 726-750)
- Update from CVS
- Merge from emacs--rel--22
- Merge from gnus--rel--5.10
* emacs--rel--22 (patch 6-17)
- Update from CVS
- Update from CVS: src/xterm.c (XTread_socket): Revert last change.
* gnus--rel--5.10 (patch 218-221)
- Merge from emacs--devo--0, emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-205
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 15 May 2007 07:17:13 +0000 |
parents | 95d0cdf160ea 51b85ee9ab0f |
children | 3619e7770f2e |
comparison
equal
deleted
inserted
replaced
90842:e8254e8eb079 | 90843:d7172f202ab8 |
---|---|
2907 (if (eq (string-match tramp-file-name-regexp file) 0) | 2907 (if (eq (string-match tramp-file-name-regexp file) 0) |
2908 (error "Sorry, vc-update-change-log does not work over Tramp"))) | 2908 (error "Sorry, vc-update-change-log does not work over Tramp"))) |
2909 (vc-call-backend (vc-responsible-backend default-directory) | 2909 (vc-call-backend (vc-responsible-backend default-directory) |
2910 'update-changelog args)) | 2910 'update-changelog args)) |
2911 | 2911 |
2912 (defun vc-default-update-changelog (backend files) | 2912 (defalias 'vc-cvs-update-changelog 'vc-update-changelog-rcs2log) |
2913 (defalias 'vc-rcs-update-changelog 'vc-update-changelog-rcs2log) | |
2914 ;; FIXME: This should probably be moved to vc-rcs.el and replaced in | |
2915 ;; vc-cvs.el by code using cvs2cl. | |
2916 (defun vc-update-changelog-rcs2log (files) | |
2913 "Default implementation of update-changelog. | 2917 "Default implementation of update-changelog. |
2914 Uses `rcs2log' which only works for RCS and CVS." | 2918 Uses `rcs2log' which only works for RCS and CVS." |
2915 ;; FIXME: We (c|sh)ould add support for cvs2cl | 2919 ;; FIXME: We (c|sh)ould add support for cvs2cl |
2916 (let ((odefault default-directory) | 2920 (let ((odefault default-directory) |
2917 (changelog (find-change-log)) | 2921 (changelog (find-change-log)) |
2948 "\t" full-name | 2952 "\t" full-name |
2949 "\t" mailing-address) | 2953 "\t" mailing-address) |
2950 (mapcar | 2954 (mapcar |
2951 (lambda (f) | 2955 (lambda (f) |
2952 (file-relative-name | 2956 (file-relative-name |
2953 (if (file-name-absolute-p f) | 2957 (expand-file-name f odefault))) |
2954 f | |
2955 (concat odefault f)))) | |
2956 files))) | 2958 files))) |
2957 "done" | 2959 "done" |
2958 (pop-to-buffer (get-buffer-create "*vc*")) | 2960 (pop-to-buffer (get-buffer-create "*vc*")) |
2959 (erase-buffer) | 2961 (erase-buffer) |
2960 (insert-file-contents tempfile) | 2962 (insert-file-contents tempfile) |