Mercurial > emacs
view lwlib/lwlib-utils.h @ 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 | e16f43875a48 |
children | ef719132ddfa |
line wrap: on
line source
#ifndef _LWLIB_UTILS_H_ #define _LWLIB_UTILS_H_ void XtNoClearRefreshWidget (Widget); typedef void (*XtApplyToWidgetsProc) (Widget, XtPointer); typedef void* (*XtApplyUntilToWidgetsProc) (Widget, XtPointer); void XtApplyToWidgets (Widget, XtApplyToWidgetsProc, XtPointer); void *XtApplyUntilToWidgets (Widget, XtApplyUntilToWidgetsProc, XtPointer); Widget *XtCompositeChildren (Widget, unsigned int *); /* returns True is the widget is being destroyed, False otherwise */ Boolean XtWidgetBeingDestroyedP (Widget widget); void XtSafelyDestroyWidget (Widget); #endif /* _LWLIB_UTILS_H_ */ /* arch-tag: 705efd86-9319-4447-80f6-16aa5b349809 (do not change this comment) */