Mercurial > emacs
view lwlib/lwlib-Xaw.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_XAW_H #define LWLIB_XAW_H #include "lwlib-int.h" extern widget_creation_entry xaw_creation_table []; Widget xaw_create_dialog (widget_instance*); Boolean lw_xaw_widget_p (Widget); void xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean); void xaw_update_one_value (widget_instance *, Widget, widget_value *); void xaw_destroy_instance (widget_instance *); void xaw_popup_menu (Widget, XEvent *); void xaw_pop_instance (widget_instance *, Boolean); #endif /* LWLIB_XAW_H */ /* arch-tag: 7c0fb4de-afd9-4112-9214-24b663cc1870 (do not change this comment) */