Mercurial > emacs
view src/unexsol.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 | b7bf941f8049 |
children | 8a8e69664178 68dd71358159 |
line wrap: on
line source
/* Trivial unexec for Solaris. */ #include <config.h> #include <stdlib.h> #include <dlfcn.h> #include "lisp.h" #include "buffer.h" #include "charset.h" #include "coding.h" int unexec (char *new_name, char *old_name, unsigned int data_start, unsigned int bss_start, unsigned int entry_address) { Lisp_Object data; Lisp_Object errstring; if (! dldump (0, new_name, RTLD_MEMORY)) return 0; data = Fcons (build_string (new_name), Qnil); synchronize_system_messages_locale (); errstring = code_convert_string_norecord (build_string (dlerror ()), Vlocale_coding_system, 0); xsignal (Qfile_error, Fcons (build_string ("Cannot unexec"), Fcons (errstring, data))); } /* arch-tag: d8ff72b3-8198-4011-8ef5-011b12027f59 (do not change this comment) */