Mercurial > emacs
view msdos/sigaction.c @ 65129:8303172e4c68
(smerge-remove-props): Make the args non-optional.
(smerge-keep-n): Remove props.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-kill-current): Don't remove props anymore
now that it's done in smerge-keep-n.
(smerge-refined-change): New face.
(smerge-refine-chopup-region, smerge-refine-highlight-change)
(smerge-refine): New funs.
(smerge-basic-map): Bind smerge-refine.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 25 Aug 2005 20:13:38 +0000 |
parents | 695cf19ef79e |
children | 60ed74508594 375f2633d815 |
line wrap: on
line source
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ #include <signal.h> #include <errno.h> int sigaction(int _sig, const struct sigaction *_act, struct sigaction *_oact) { int retval = 0; if (_oact) { void (*installed_sig)(int) = signal (_sig, SIG_IGN); /* FIXME */ if (installed_sig == SIG_ERR) { retval = -1; errno = EINVAL; } else signal (_sig, installed_sig); _oact->sa_handler = installed_sig; retval = sigemptyset (&_oact->sa_mask); _oact->sa_flags = 0; } if (_act) { if (signal (_sig, _act->sa_handler) == SIG_ERR) { retval = -1; errno = EINVAL; } } return 0; } /* arch-tag: 39526405-3d3a-44fe-af28-82a515e0c8e8 (do not change this comment) */