Mercurial > emacs
view src/pre-crt0.c @ 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 | 695cf19ef79e |
children | 375f2633d815 ef719132ddfa |
line wrap: on
line source
/* This file is loaded before crt0.o on machines where we do not remap part of the data space into text space in unexec. On these machines, there is no problem with standard crt0.o's that make environ an initialized variable. However, we do need to make sure the label data_start exists anyway. */ /* Create a label to appear at the beginning of data space. */ int data_start = 0; /* arch-tag: 2e260272-0790-495f-9362-55abd56b5c5a (do not change this comment) */