Mercurial > emacs
view lwlib/lwlib-Xaw.h @ 54527:192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
(smerge-context-menu-map): Remove unused var.
(smerge-keep-all): Preserve markers.
(smerge-keep-n): New fun.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-ediff): Use it.
(smerge-kill-current): Use it. Make it work on some 3-part conflicts.
(smerge-popup-context-menu): Also use context-menu on 3-part conflicts.
(smerge-resolve): Resolve trivial 3-part conflicts.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 23 Mar 2004 19:56:42 +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) */