Mercurial > emacs

view src/s/hpux9shr.h @ 93956:bfc762f0b49c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
line wrap: on
line source

#define ORDINARY_LINK
#define HPUX_USE_SHLIBS
#define RUN_TIME_REMAP

#include "hpux9.h"

#if 0 /* No longer needed, since in current GCC -g no longer does that.  */
/* We must turn off -g since it forces -static.  */
#ifdef __GNUC__
#undef C_DEBUG_SWITCH
#define C_DEBUG_SWITCH
#endif
#endif

/* arch-tag: 1b259627-c5f6-4260-866f-781b06d72f6b
   (do not change this comment) */