[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el,v |
Date: |
Thu, 25 Sep 2008 01:44:24 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/09/25 01:44:24
Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.702
retrieving revision 1.703
diff -u -b -r1.702 -r1.703
--- vc.el 24 Sep 2008 19:14:58 -0000 1.702
+++ vc.el 25 Sep 2008 01:44:23 -0000 1.703
@@ -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)
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Glenn Morris, 2008/09/01
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Stefan Monnier, 2008/09/07
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Chong Yidong, 2008/09/24
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Chong Yidong, 2008/09/24
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Glenn Morris, 2008/09/28
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Glenn Morris, 2008/09/28