ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: tumble three conditions, for consistency in comparisons

master
Benno Schulenberg 2020-01-31 16:05:51 +01:00
parent 073251fdb1
commit a2f8703df5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nano.c
View File

@ -1476,7 +1476,7 @@ void suck_up_input_and_paste_it(void)
line = line->next; line = line->next;
line->data = copy_of(""); line->data = copy_of("");
index = 0; index = 0;
} else if ((input >= 0x20 && input <= 0xFF && input != DEL_CODE) || } else if ((0x20 <= input && input <= 0xFF && input != DEL_CODE) ||
input == TAB_CODE) { input == TAB_CODE) {
line->data = charealloc(line->data, index + 2); line->data = charealloc(line->data, index + 2);
line->data[index++] = (char)input; line->data[index++] = (char)input;

4
src/winio.c
View File

@ -934,7 +934,7 @@ int parse_kbinput(WINDOW *win)
key_buffer_len == 0 || *key_buffer == ESC_CODE) { key_buffer_len == 0 || *key_buffer == ESC_CODE) {
/* One escape followed by a single non-escape: /* One escape followed by a single non-escape:
* meta key sequence mode. */ * meta key sequence mode. */
if (!solitary || (keycode >= 0x20 && keycode < 0x7F)) if (!solitary || (0x20 <= keycode && keycode <= 0x7E))
meta_key = TRUE; meta_key = TRUE;
retval = (shifted_metas) ? keycode : tolower(keycode); retval = (shifted_metas) ? keycode : tolower(keycode);
} else } else
@ -3091,7 +3091,7 @@ size_t get_chunk_and_edge(size_t column, linestruct *line, size_t *leftedge)
end_col = get_softwrap_breakpoint(line->data, start_col, &end_of_line); end_col = get_softwrap_breakpoint(line->data, start_col, &end_of_line);
/* We reached the end of the line and/or found column, so get out. */ /* We reached the end of the line and/or found column, so get out. */
if (end_of_line || (column >= start_col && column < end_col)) { if (end_of_line || (start_col <= column && column < end_col)) {
if (leftedge != NULL) if (leftedge != NULL)
*leftedge = start_col; *leftedge = start_col;
return current_chunk; return current_chunk;