Mercurial > emacs
comparison lisp/vc-hooks.el @ 90732:bc10a33dd40b
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 01 Jan 2007 03:21:06 +0000 |
| parents | f1d13e615070 e58390f88130 |
| children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
| 90731:a6c97c25a666 | 90732:bc10a33dd40b |
|---|---|
| 623 If MANUAL is non-nil it means that a name for backups created by | 623 If MANUAL is non-nil it means that a name for backups created by |
| 624 the user should be returned; if REGEXP is non-nil that means to return | 624 the user should be returned; if REGEXP is non-nil that means to return |
| 625 a regexp for matching all such backup files, regardless of the version." | 625 a regexp for matching all such backup files, regardless of the version." |
| 626 (if regexp | 626 (if regexp |
| 627 (concat (regexp-quote (file-name-nondirectory file)) | 627 (concat (regexp-quote (file-name-nondirectory file)) |
| 628 "\\.~[0-9.]+" (unless manual "\\.") "~") | 628 "\\.~.+" (unless manual "\\.") "~") |
| 629 (expand-file-name (concat (file-name-nondirectory file) | 629 (expand-file-name (concat (file-name-nondirectory file) |
| 630 ".~" (or rev (vc-workfile-version file)) | 630 ".~" (subst-char-in-string |
| 631 ?/ ?_ (or rev (vc-workfile-version file))) | |
| 631 (unless manual ".") "~") | 632 (unless manual ".") "~") |
| 632 (file-name-directory file)))) | 633 (file-name-directory file)))) |
| 633 | 634 |
| 634 (defun vc-delete-automatic-version-backups (file) | 635 (defun vc-delete-automatic-version-backups (file) |
| 635 "Delete all existing automatic version backups for FILE." | 636 "Delete all existing automatic version backups for FILE." |