From 4147c5e0fcfc989ba22443d315c7eb84b14d4d08 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 20 Jun 2014 07:55:24 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ src/global.c | 4 ---- src/proto.h | 14 ++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02a90f64..2ebab49e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-20 Benno Schulenberg + * src/proto.h, src/global.c: Remove two obsolete variables and + regroup some stuff. + 2014-06-19 Benno Schulenberg * src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()' for consistency, and tweak the related comments. diff --git a/src/global.c b/src/global.c index 3de904ff..bf6a36b1 100644 --- a/src/global.c +++ b/src/global.c @@ -154,18 +154,14 @@ syntaxtype *syntaxes = NULL; /* The global list of color syntaxes. */ char *syntaxstr = NULL; /* The color syntax name specified on the command line. */ - #endif bool edit_refresh_needed = FALSE; /* Did a command mangle enough of the buffer refresh that we * should repaint the screen? */ -const shortcut *currshortcut; - /* The current shortcut list we're using. */ int currmenu; /* The currently loaded menu. */ - sc *sclist = NULL; /* Pointer to the start of the shortcuts list. */ subnfunc *allfuncs = NULL; diff --git a/src/proto.h b/src/proto.h index f1059e09..81cb3740 100644 --- a/src/proto.h +++ b/src/proto.h @@ -30,7 +30,6 @@ #ifndef NANO_TINY extern sigjmp_buf jump_buf; extern bool jump_buf_main; -extern bool use_undo; #endif #ifndef DISABLE_WRAPJUSTIFY @@ -63,7 +62,6 @@ extern char *matchbrackets; #if !defined(NANO_TINY) && !defined(DISABLE_NANORC) extern char *whitespace; extern int whitespace_len[2]; -extern undo_type last_action; #endif extern const char *exit_tag; @@ -101,18 +99,18 @@ extern char *full_operating_dir; extern char *alt_speller; #endif -extern sc *sclist; -extern subnfunc *allfuncs; -extern subnfunc *exitfunc; -extern subnfunc *uncutfunc; #ifndef DISABLE_COLOR extern syntaxtype *syntaxes; extern char *syntaxstr; #endif extern bool edit_refresh_needed; -extern const shortcut *currshortcut; + extern int currmenu; +extern sc *sclist; +extern subnfunc *allfuncs; +extern subnfunc *exitfunc; +extern subnfunc *uncutfunc; #ifndef DISABLE_HISTORIES extern filestruct *search_history; @@ -122,7 +120,6 @@ extern filestruct *replace_history; extern filestruct *replaceage; extern filestruct *replacebot; extern poshiststruct *poshistory; -void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos); #endif #ifdef HAVE_REGEX_H @@ -342,6 +339,7 @@ void save_history(void); int check_dotnano(void); void load_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); #endif #ifndef DISABLE_COLOR -- 2.39.5