diff ../orig/leafpad-0.8.17/src/hlight.c src/hlight.c
76a77,80
> 	gtk_text_buffer_create_tag(buffer, "questioned",
> 		"background", "orange",
> 		"foreground", "black",
> 		NULL);
diff ../orig/leafpad-0.8.17/src/search.c src/search.c
83c83
< gboolean document_search_real(GtkWidget *textview, gint direction)
---
> gboolean document_search_real_iters(GtkWidget *textview, gint direction, GtkTextIter *pmatch_start, GtkTextIter *pmatch_end)
136a137,138
> 		*pmatch_start = match_start;
> 		*pmatch_end   = match_end;
144a147,152
> gboolean document_search_real(GtkWidget *textview, gint direction)
> {
> 	GtkTextIter match_start, match_end;
> 	return document_search_real_iters(textview, direction, &match_start, &match_end);
> }
> 
150c158
< 	gint num = 0, offset;
---
> 	gint num = 0, offset, dres;
187c195
< 			res = document_search_real(textview, 2);
---
> 			res = document_search_real_iters(textview, 2, &match_start, &match_end);
190a199,200
> 				gtk_text_buffer_apply_tag_by_name(textbuffer,
> 					"questioned", &match_start, &match_end);
194,198c204,207
< #if GTK_CHECK_VERSION(2, 10, 0)
< 					GtkTextIter ins,bou;
< 					gtk_text_buffer_get_selection_bounds(textbuffer, &ins, &bou);
< #endif
< 				switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) {
---
> 				dres = gtk_dialog_run(GTK_DIALOG(q_dialog));
> 				gtk_text_buffer_remove_tag_by_name(textbuffer,
> 					"questioned", &match_start, &match_end);
> 				switch (dres) {
200,202d208
< #if GTK_CHECK_VERSION(2, 10, 0)
< 					gtk_text_buffer_select_range(textbuffer, &ins, &bou);
< #endif
214c220
< 			gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE);
---
> 			gtk_text_buffer_delete_interactive(textbuffer, &match_start, &match_end, TRUE);