Mercurial > emacs
view src/unexsol.c @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | 99084f50aa8e |
children | ef719132ddfa |
line wrap: on
line source
/* Trivial unexec for Solaris. */ #include <config.h> #include <dlfcn.h> #include <setjmp.h> #include "lisp.h" #include "buffer.h" #include "charset.h" #include "coding.h" int unexec (const char *new_name, const char *old_name) { 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) */