Mercurial > emacs
view lwlib/lwlib-Xaw.h @ 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 | 375f2633d815 e16f43875a48 |
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 __P ((widget_instance*)); Boolean lw_xaw_widget_p __P ((Widget)); void xaw_update_one_widget __P ((widget_instance *, Widget, widget_value *, Boolean)); void xaw_update_one_value __P ((widget_instance *, Widget, widget_value *)); void xaw_destroy_instance __P ((widget_instance *)); void xaw_popup_menu __P ((Widget, XEvent *)); void xaw_pop_instance __P ((widget_instance *, Boolean)); #endif /* LWLIB_XAW_H */ /* arch-tag: 7c0fb4de-afd9-4112-9214-24b663cc1870 (do not change this comment) */