Mercurial > emacs
view lwlib/lwlib-Xlw.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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 22 Aug 2005 14:38:51 +0000 |
parents | 695cf19ef79e |
children | 375f2633d815 e16f43875a48 |
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 __P ((Widget widget)); void xlw_update_one_widget __P ((widget_instance* instance, Widget widget, widget_value* val, Boolean deep_p)); void xlw_update_one_value __P ((widget_instance* instance, Widget widget, widget_value* val)); void xlw_destroy_instance __P ((widget_instance* instance)); void xlw_pop_instance __P ((widget_instance* instance, Boolean up)); void xlw_popup_menu __P ((Widget widget, XEvent * event)); #endif /* LWLIB_XLW_H */ /* arch-tag: e5b1511d-8992-4dad-b947-a2440d8f10a2 (do not change this comment) */