view lwlib/lwlib-utils.h @ 65067:52de8046c483

(smerge-basic-map): Bind smerge-combine-with-next. (smerge-auto-leave): Make undo re-enable the mode. (debug-ignored-errors): Add the user-error of impossible resolution. (smerge-resolve): Move things around a bit, in preparation for later. (smerge-diff): Don't fail if the buffer has no associated file. (ediff-ancestor-buffer, ediff-quit-hook): Quieten byte-compiler. (smerge-conflict-overlay): New function. (smerge-match-conflict): Don't add text properties here. (smerge-find-conflict): Instead, add an overlay here. Also check for the case where we're inside a conflict already, so as to obviate the need for font-lock-multiline, which is unbearably slow with large conflicts and ciomplex font-lock patterns. (smerge-remove-props): Remove overlay rather than text-properties. (smerge-mode): Don't set font-lock-multiline. Remove overlays when turned off.

#ifndef _LWLIB_UTILS_H_
#define _LWLIB_UTILS_H_

void XtNoClearRefreshWidget __P ((Widget));

typedef void (*XtApplyToWidgetsProc) __P ((Widget, XtPointer));
typedef void* (*XtApplyUntilToWidgetsProc) __P ((Widget, XtPointer));

void XtApplyToWidgets __P ((Widget, XtApplyToWidgetsProc, XtPointer));
void *XtApplyUntilToWidgets __P ((Widget, XtApplyUntilToWidgetsProc, XtPointer));

Widget *XtCompositeChildren __P ((Widget, unsigned int *));

/* returns True is the widget is being destroyed, False otherwise */
Boolean
XtWidgetBeingDestroyedP __P ((Widget widget));

void XtSafelyDestroyWidget __P ((Widget));

#endif /* _LWLIB_UTILS_H_ */

/* arch-tag: 705efd86-9319-4447-80f6-16aa5b349809
   (do not change this comment) */