add do_mark_region, do_mark_paragraph

* add do_mark_region to set hilighted region
* add command mark-paragraph on M-h
* make command mark-whole-buffer display hilighted region
This commit is contained in:
Charlie Gordon 2014-01-16 14:28:28 +00:00
commit f545ee779b
3 changed files with 24 additions and 9 deletions

29
qe.c
View file

@ -472,6 +472,16 @@ void text_move_word_left_right(EditState *s, int dir)
}
}
void do_mark_region(EditState *s, int mark, int offset)
{
/* CG: Should have local and global mark rings */
s->b->mark = clamp(mark, 0, s->b->total_size);
s->offset = clamp(offset, 0, s->b->total_size);
/* activate region hilite */
if (s->qe_state->hilite_region)
s->region_style = QE_STYLE_REGION_HILITE;
}
/* paragraph handling */
int eb_next_paragraph(EditBuffer *b, int offset)
@ -511,6 +521,14 @@ int eb_start_paragraph(EditBuffer *b, int offset)
return offset;
}
void do_mark_paragraph(EditState *s)
{
int start = eb_start_paragraph(s->b, s->offset);
int end = eb_next_paragraph(s->b, s->offset);
do_mark_region(s, start, end);
}
void do_backward_paragraph(EditState *s)
{
int offset;
@ -1413,20 +1431,13 @@ void do_break(EditState *s)
/* block functions */
void do_set_mark(EditState *s)
{
/* CG: Should have local and global mark rings */
s->b->mark = s->offset;
/* activate region hilite */
if (s->qe_state->hilite_region)
s->region_style = QE_STYLE_REGION_HILITE;
do_mark_region(s, s->offset, s->offset);
put_status(s, "Mark set");
}
void do_mark_whole_buffer(EditState *s)
{
s->b->mark = s->b->total_size;
s->offset = 0;
do_mark_region(s, s->b->total_size, 0);
}
EditBuffer *new_yank_buffer(QEmacsState *qs, EditBuffer *base)

2
qe.h
View file

@ -1693,8 +1693,10 @@ void do_eof(EditState *s);
void do_bol(EditState *s);
void do_eol(EditState *s);
void do_word_right(EditState *s, int dir);
void do_mark_region(EditState *s, int mark, int offset);
int eb_next_paragraph(EditBuffer *b, int offset);
int eb_start_paragraph(EditBuffer *b, int offset);
void do_mark_paragraph(EditState *s);
void do_backward_paragraph(EditState *s);
void do_forward_paragraph(EditState *s);
void do_kill_paragraph(EditState *s, int dir);

View file

@ -189,6 +189,8 @@ static CmdDef basic_commands[] = {
/*---------------- Paragraph / case handling ----------------*/
CMD0( KEY_META('h'), KEY_NONE,
"mark-paragraph", do_mark_paragraph)
CMD0( KEY_META('{'), KEY_NONE,
"backward-paragraph", do_backward_paragraph)
CMD0( KEY_META('}'), KEY_NONE,