mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-01-12 20:39:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

DB's fill and window length fixes

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1442 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2003-02-10 02:43:48 +00:00
parent 3a78406d56
commit f8f2d586dc
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -3,6 +3,12 @@ CVS code
- Translation updates (see po/ChangeLog for details). - Translation updates (see po/ChangeLog for details).
- Fix globals and externs such that nano will compile with - Fix globals and externs such that nano will compile with
DISABLE_SPELLER (David Benbennick). DISABLE_SPELLER (David Benbennick).
- Fix unreasonable fill values by wrapping at length 0 instead
of erroring out, and don't start up if the window size is too
small but fill is set reasonably. Changes to
nano.c:global_init(), window_init(), and handle_sigwinch().
New macro MIN_EDITOR_COLS replaces MIN_FILL_LENGTH
(David Benbennick).
- files.c: - files.c:
cwd_tab_completion() cwd_tab_completion()
- Memory leak fix (David Benbennick). - Memory leak fix (David Benbennick).

17
nano.c
View File

@ -199,7 +199,8 @@ void global_init(int save_cutbuffer)
current_x = 0; current_x = 0;
current_y = 0; current_y = 0;
if ((editwinrows = LINES - 5 + no_help()) < MIN_EDITOR_ROWS) editwinrows = LINES - 5 + no_help();
if (editwinrows < MIN_EDITOR_ROWS || COLS < MIN_EDITOR_COLS)
die_too_small(); die_too_small();
fileage = NULL; fileage = NULL;
@ -216,8 +217,8 @@ void global_init(int save_cutbuffer)
fill = wrap_at; fill = wrap_at;
if (fill <= 0) if (fill <= 0)
fill += COLS; fill += COLS;
if (fill < MIN_FILL_LENGTH) if (fill < 0)
die_too_small(); fill = 0;
#endif #endif
hblank = charalloc(COLS + 1); hblank = charalloc(COLS + 1);
@ -227,7 +228,8 @@ void global_init(int save_cutbuffer)
void window_init(void) void window_init(void)
{ {
if ((editwinrows = LINES - 5 + no_help()) < MIN_EDITOR_ROWS) editwinrows = LINES - 5 + no_help();
if (editwinrows < MIN_EDITOR_ROWS)
die_too_small(); die_too_small();
if (edit != NULL) if (edit != NULL)
@ -2867,15 +2869,16 @@ void handle_sigwinch(int s)
* But not in all cases, argh. */ * But not in all cases, argh. */
COLS = win.ws_col; COLS = win.ws_col;
LINES = win.ws_row; LINES = win.ws_row;
if ((editwinrows = LINES - 5 + no_help()) < MIN_EDITOR_ROWS) editwinrows = LINES - 5 + no_help();
if (editwinrows < MIN_EDITOR_ROWS || COLS < MIN_EDITOR_COLS)
die_too_small(); die_too_small();
#ifndef DISABLE_WRAPJUSTIFY #ifndef DISABLE_WRAPJUSTIFY
fill = wrap_at; fill = wrap_at;
if (fill <= 0) if (fill <= 0)
fill += COLS; fill += COLS;
if (fill < MIN_FILL_LENGTH) if (fill < 0)
die_too_small(); fill = 0;
#endif #endif
hblank = nrealloc(hblank, COLS + 1); hblank = nrealloc(hblank, COLS + 1);

7
nano.h
View File

@ -417,14 +417,13 @@ typedef enum {
/* Minimum editor window rows required for nano to work correctly */ /* Minimum editor window rows required for nano to work correctly */
#define MIN_EDITOR_ROWS 3 #define MIN_EDITOR_ROWS 3
/* Minimum editor window cols required for nano to work correctly */
#define MIN_EDITOR_COLS 10
/* Default number of characters from end-of-line where text wrapping /* Default number of characters from end-of-line where text wrapping
occurs */ occurs */
#define CHARS_FROM_EOL 8 #define CHARS_FROM_EOL 8
/* Minimum fill length (space available for text before wrapping
occurs) */
#define MIN_FILL_LENGTH 10
/* Maximum number of search history strings saved, same value used for /* Maximum number of search history strings saved, same value used for
replace history */ replace history */
#define MAX_SEARCH_HISTORY 100 #define MAX_SEARCH_HISTORY 100