Mercurial > emacs
view lwlib/lwlib-Xlw.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_XLW_H #define LWLIB_XLW_H #include "lwlib-int.h" extern widget_creation_entry xlw_creation_table []; extern widget_creation_function xlw_create_dialog; Boolean lw_lucid_widget_p (Widget widget); void xlw_update_one_widget (widget_instance* instance, Widget widget, widget_value* val, Boolean deep_p); void xlw_update_one_value (widget_instance* instance, Widget widget, widget_value* val); void xlw_destroy_instance (widget_instance* instance); void xlw_pop_instance (widget_instance* instance, Boolean up); void xlw_popup_menu (Widget widget, XEvent * event); #endif /* LWLIB_XLW_H */ /* arch-tag: e5b1511d-8992-4dad-b947-a2440d8f10a2 (do not change this comment) */