Mercurial > emacs
comparison lisp/vc.el @ 98326:c5442f509109
(vc-default-mark-resolved): New function.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 24 Sep 2008 19:14:58 +0000 |
| parents | 4a399b9bc4b9 |
| children | 26ff192a882a |
comparison
equal
deleted
inserted
replaced
| 98325:a15398006f0d | 98326:c5442f509109 |
|---|---|
| 2455 | 2455 |
| 2456 (defun vc-default-dir-status-files (backend dir files default-state update-function) | 2456 (defun vc-default-dir-status-files (backend dir files default-state update-function) |
| 2457 (funcall update-function | 2457 (funcall update-function |
| 2458 (mapcar (lambda (file) (list file default-state)) files))) | 2458 (mapcar (lambda (file) (list file default-state)) files))) |
| 2459 | 2459 |
| 2460 (defun vc-default-mark-resolved (backend files) | |
| 2461 (message | |
| 2462 (substitute-command-keys | |
| 2463 "Conflicts have been resolved in %s. \ | |
| 2464 Type \\[vc-next-action] to check in changes.") | |
| 2465 (if (> (length files) 1) | |
| 2466 (format "%d files" (length files)) | |
| 2467 "this file"))) | |
| 2468 | |
| 2460 (defun vc-check-headers () | 2469 (defun vc-check-headers () |
| 2461 "Check if the current file has any headers in it." | 2470 "Check if the current file has any headers in it." |
| 2462 (interactive) | 2471 (interactive) |
| 2463 (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) | 2472 (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) |
| 2464 | 2473 |