[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v |
Date: |
Thu, 10 Apr 2008 07:32:29 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/04/10 07:32:27
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13407
retrieving revision 1.13408
diff -u -b -r1.13407 -r1.13408
--- ChangeLog 10 Apr 2008 05:20:15 -0000 1.13407
+++ ChangeLog 10 Apr 2008 07:32:25 -0000 1.13408
@@ -1,3 +1,25 @@
+2008-04-10 Dan Nicolaescu <address@hidden>
+
+ * vc-hooks.el (vc-state): Add new state `conflict'.
+ (vc-after-save): Use when not if.
+ (vc-default-mode-line-string): Deal with the conflict state.
+ (vc-prefix-map):
+ (vc-menu-map): Bind vc-status instead of vc-directory.
+
+ * vc.el (vc-editable-p):
+ (vc-default-status-printer):
+ (vc-next-action): Deal with the conflict state.
+ (vc-mark-resolved): New function.
+ (vc-status-mode): Fix mode name.
+ (vc-default-comment-history): Use when not if.
+ (Todo): Add new entries, remove old ones.
+
+ * vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
+ (vc-cvs-parse-status):
+ (vc-cvs-after-dir-status):
+ * vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
+ Detect the conflict state.
+
2008-04-10 Glenn Morris <address@hidden>
* Makefile.in (MH_E_DIR): New variable.
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, (continued)
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Michael Albinus, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Alexandre Julliard, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/04/09
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v,
Dan Nicolaescu <=
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Juanma Barranquero, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Dan Nicolaescu, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Stefan Monnier, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Chong Yidong, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Chong Yidong, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/ChangeLog,v, Glenn Morris, 2008/04/10