Mercurial > emacs
changeset 98336:26ff192a882a
(vc-mark-resolved): Move message here from vc-default-mark-resolved.
(vc-default-mark-resolved): Change to an alias for ignore.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 25 Sep 2008 01:44:23 +0000 |
| parents | c82c45a5263a |
| children | 34fed5300274 |
| files | lisp/vc.el |
| diffstat | 1 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Thu Sep 25 01:44:10 2008 +0000 +++ b/lisp/vc.el Thu Sep 25 01:44:23 2008 +0000 @@ -1289,6 +1289,13 @@ (with-vc-properties files (vc-call-backend backend 'mark-resolved files) + (message + (substitute-command-keys + "Conflicts have been resolved in %s. \ +Type \\[vc-next-action] to check in changes.") + (if (> (length files) 1) + (format "%d files" (length files)) + "this file")) ;; FIXME: Is this TRTD? Might not be. `((vc-state . edited)))) @@ -2452,20 +2459,12 @@ (message "Checking out %s...done" file)))) (defalias 'vc-default-revision-completion-table 'ignore) +(defalias 'vc-default-mark-resolved 'ignore) (defun vc-default-dir-status-files (backend dir files default-state update-function) (funcall update-function (mapcar (lambda (file) (list file default-state)) files))) -(defun vc-default-mark-resolved (backend files) - (message - (substitute-command-keys - "Conflicts have been resolved in %s. \ -Type \\[vc-next-action] to check in changes.") - (if (> (length files) 1) - (format "%d files" (length files)) - "this file"))) - (defun vc-check-headers () "Check if the current file has any headers in it." (interactive)