Mercurial > emacs
view test/ChangeLog @ 93956:bfc762f0b49c
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 10 Apr 2008 07:32:25 +0000 |
| parents | 74d8443a6c09 |
| children | f9e1a40c4f47 |
line wrap: on
line source
2008-02-29 Glenn Morris <rgm@gnu.org> * README: New file. 2008-02-29 Ulf Jasper <ulf.jasper@web.de> * icalendar-testsuite.el: New file. ;; Local Variables: ;; coding: utf-8 ;; add-log-time-zone-rule: t ;; End: Copyright (C) 2008 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ;;; arch-tag: 6f0d1c86-c141-46da-b387-cf17e38c7bf7