mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* edit.c (edit_auto_indent): Remove redundant parameters. 

Change the indentation strategy to copy whitespace
from the previous line instead of filling up with allegedly
equivalent whitespace depending on the tab setting.
(edit_execute_cmd): Accomodate change of parameters to
edit_auto_indent().
This commit is contained in:
Pavel Tsekov 2006-01-26 15:42:56 +00:00
parent c8494f41bb
commit 450fe431fc
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
edit/ChangeLog
View File

@ -1,3 +1,12 @@
2006-01-26 Oswald Buddenhagen <ossi@kde.org>
* edit.c (edit_auto_indent): Remove redundant parameters.
Change the indentation strategy to copy whitespace
from the previous line instead of filling up with allegedly
equivalent whitespace depending on the tab setting.
(edit_execute_cmd): Accomodate change of parameters to
edit_auto_indent().
2005-11-22 Leonard den Ottolander <leonard den ottolander nl>
* editcmd.c (edit_replace_dialog): Alt-p is in use for the

23
edit/edit.c
View File

@ -1934,17 +1934,20 @@ void edit_insert_indent (WEdit * edit, int indent)
}
static void
edit_auto_indent (WEdit * edit, int extra, int no_advance)
edit_auto_indent (WEdit * edit)
{
long p;
int indent;
char c;
p = edit->curs1;
while (isspace (edit_get_byte (edit, p - 1)) && p > 0) /* move back/up to a line with text */
p--;
indent = edit_indent_width (edit, edit_bol (edit, p));
if (edit->curs_col < indent && no_advance)
indent = edit->curs_col;
edit_insert_indent (edit, indent + (option_fake_half_tabs ? HALF_TAB_SIZE : TAB_SIZE) * space_width * extra);
/* use the previous line as a template */
p = edit_move_backward (edit, p, 1);
/* copy the leading whitespace of the line */
for (;;) { /* no range check - the line _is_ \n-terminated */
c = edit_get_byte (edit, p++);
if (c != ' ' && c != '\t')
break;
edit_insert (edit, c);
}
}
static void edit_double_newline (WEdit * edit)
@ -2255,12 +2258,12 @@ edit_execute_cmd (WEdit *edit, int command, int char_for_insertion)
if (option_auto_para_formatting) {
edit_double_newline (edit);
if (option_return_does_auto_indent)
edit_auto_indent (edit, 0, 1);
edit_auto_indent (edit);
format_paragraph (edit, 0);
} else {
edit_insert (edit, '\n');
if (option_return_does_auto_indent) {
edit_auto_indent (edit, 0, 1);
edit_auto_indent (edit);
}
}
break;