tweaks: exclude the guide-stripe code from the tiny version
The option is not available, so including the code is pointless.master
parent
902b4674f9
commit
15959346fb
|
@ -111,8 +111,10 @@ int editwincols = -1;
|
||||||
/* The number of usable columns in the edit window: COLS - margin. */
|
/* The number of usable columns in the edit window: COLS - margin. */
|
||||||
int margin = 0;
|
int margin = 0;
|
||||||
/* The amount of space reserved at the left for line numbers. */
|
/* The amount of space reserved at the left for line numbers. */
|
||||||
|
#ifndef NANO_TINY
|
||||||
ssize_t stripe_column = 0;
|
ssize_t stripe_column = 0;
|
||||||
/* The column at which a vertical bar will be drawn. */
|
/* The column at which a vertical bar will be drawn. */
|
||||||
|
#endif
|
||||||
|
|
||||||
filestruct *cutbuffer = NULL;
|
filestruct *cutbuffer = NULL;
|
||||||
/* The buffer where we store cut text. */
|
/* The buffer where we store cut text. */
|
||||||
|
|
|
@ -2137,6 +2137,7 @@ int main(int argc, char **argv)
|
||||||
ignore_rcfiles = TRUE;
|
ignore_rcfiles = TRUE;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef NANO_TINY
|
||||||
case 'J':
|
case 'J':
|
||||||
if (!parse_num(optarg, &stripe_column) || stripe_column <= 0) {
|
if (!parse_num(optarg, &stripe_column) || stripe_column <= 0) {
|
||||||
fprintf(stderr, _("Guide column \"%s\" is invalid"), optarg);
|
fprintf(stderr, _("Guide column \"%s\" is invalid"), optarg);
|
||||||
|
@ -2144,6 +2145,7 @@ int main(int argc, char **argv)
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
case 'K':
|
case 'K':
|
||||||
SET(RAW_SEQUENCES);
|
SET(RAW_SEQUENCES);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -88,7 +88,9 @@ extern WINDOW *bottomwin;
|
||||||
extern int editwinrows;
|
extern int editwinrows;
|
||||||
extern int editwincols;
|
extern int editwincols;
|
||||||
extern int margin;
|
extern int margin;
|
||||||
|
#ifndef NANO_TINY
|
||||||
extern ssize_t stripe_column;
|
extern ssize_t stripe_column;
|
||||||
|
#endif
|
||||||
|
|
||||||
extern filestruct *cutbuffer;
|
extern filestruct *cutbuffer;
|
||||||
extern filestruct *cutbottom;
|
extern filestruct *cutbottom;
|
||||||
|
|
|
@ -2685,6 +2685,7 @@ void edit_draw(filestruct *fileptr, const char *converted,
|
||||||
}
|
}
|
||||||
#endif /* ENABLE_COLOR */
|
#endif /* ENABLE_COLOR */
|
||||||
|
|
||||||
|
#ifndef NANO_TINY
|
||||||
if (stripe_column > from_col && !inhelp) {
|
if (stripe_column > from_col && !inhelp) {
|
||||||
const ssize_t target_column = stripe_column - from_col - 1;
|
const ssize_t target_column = stripe_column - from_col - 1;
|
||||||
const char *text = converted + actual_x(converted, target_column);
|
const char *text = converted + actual_x(converted, target_column);
|
||||||
|
@ -2695,7 +2696,6 @@ void edit_draw(filestruct *fileptr, const char *converted,
|
||||||
wattroff(edit, interface_color_pair[GUIDE_STRIPE]);
|
wattroff(edit, interface_color_pair[GUIDE_STRIPE]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NANO_TINY
|
|
||||||
/* If the mark is on, and fileptr is at least partially selected, we
|
/* If the mark is on, and fileptr is at least partially selected, we
|
||||||
* need to paint it. */
|
* need to paint it. */
|
||||||
if (openfile->mark &&
|
if (openfile->mark &&
|
||||||
|
|
Loading…
Reference in New Issue