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

Removing two obsolete variables and regrouping some stuff. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4992 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-06-20 07:55:24 +00:00
parent 3f816eeb58
commit 4147c5e0fc
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2014-06-20 Benno Schulenberg <bensberg@justemail.net>
* src/proto.h, src/global.c: Remove two obsolete variables and
regroup some stuff.
2014-06-19 Benno Schulenberg <bensberg@justemail.net> 2014-06-19 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()' * src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()'
for consistency, and tweak the related comments. for consistency, and tweak the related comments.

4
src/global.c
View File

@ -154,18 +154,14 @@ syntaxtype *syntaxes = NULL;
/* The global list of color syntaxes. */ /* The global list of color syntaxes. */
char *syntaxstr = NULL; char *syntaxstr = NULL;
/* The color syntax name specified on the command line. */ /* The color syntax name specified on the command line. */
#endif #endif
bool edit_refresh_needed = FALSE; bool edit_refresh_needed = FALSE;
/* Did a command mangle enough of the buffer refresh that we /* Did a command mangle enough of the buffer refresh that we
* should repaint the screen? */ * should repaint the screen? */
const shortcut *currshortcut;
/* The current shortcut list we're using. */
int currmenu; int currmenu;
/* The currently loaded menu. */ /* The currently loaded menu. */
sc *sclist = NULL; sc *sclist = NULL;
/* Pointer to the start of the shortcuts list. */ /* Pointer to the start of the shortcuts list. */
subnfunc *allfuncs = NULL; subnfunc *allfuncs = NULL;

14
src/proto.h
View File

@ -30,7 +30,6 @@
#ifndef NANO_TINY #ifndef NANO_TINY
extern sigjmp_buf jump_buf; extern sigjmp_buf jump_buf;
extern bool jump_buf_main; extern bool jump_buf_main;
extern bool use_undo;
#endif #endif
#ifndef DISABLE_WRAPJUSTIFY #ifndef DISABLE_WRAPJUSTIFY
@ -63,7 +62,6 @@ extern char *matchbrackets;
#if !defined(NANO_TINY) && !defined(DISABLE_NANORC) #if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
extern char *whitespace; extern char *whitespace;
extern int whitespace_len[2]; extern int whitespace_len[2];
extern undo_type last_action;
#endif #endif
extern const char *exit_tag; extern const char *exit_tag;
@ -101,18 +99,18 @@ extern char *full_operating_dir;
extern char *alt_speller; extern char *alt_speller;
#endif #endif
extern sc *sclist;
extern subnfunc *allfuncs;
extern subnfunc *exitfunc;
extern subnfunc *uncutfunc;
#ifndef DISABLE_COLOR #ifndef DISABLE_COLOR
extern syntaxtype *syntaxes; extern syntaxtype *syntaxes;
extern char *syntaxstr; extern char *syntaxstr;
#endif #endif
extern bool edit_refresh_needed; extern bool edit_refresh_needed;
extern const shortcut *currshortcut;
extern int currmenu; extern int currmenu;
extern sc *sclist;
extern subnfunc *allfuncs;
extern subnfunc *exitfunc;
extern subnfunc *uncutfunc;
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
extern filestruct *search_history; extern filestruct *search_history;
@ -122,7 +120,6 @@ extern filestruct *replace_history;
extern filestruct *replaceage; extern filestruct *replaceage;
extern filestruct *replacebot; extern filestruct *replacebot;
extern poshiststruct *poshistory; extern poshiststruct *poshistory;
void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos);
#endif #endif
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
@ -342,6 +339,7 @@ void save_history(void);
int check_dotnano(void); int check_dotnano(void);
void load_poshistory(void); void load_poshistory(void);
void save_poshistory(void); void save_poshistory(void);
void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos);
int check_poshistory(const char *file, ssize_t *line, ssize_t *column); int check_poshistory(const char *file, ssize_t *line, ssize_t *column);
#endif #endif
#ifndef DISABLE_COLOR #ifndef DISABLE_COLOR