From 24d9f3121ec86134a1bffd7b428211d94ed99812 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 21 Apr 2014 13:00:49 +0000 Subject: [PATCH] Deleting some more unused stuff. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4793 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/nano.h | 9 --------- src/proto.h | 22 +++++----------------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5972a33..f25fefb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * src/global.c (strtosc, strtomenu): Sort functions slightly better, and allow things to be rebound in the linter menu. * src/nano.h: Delete a large bunch of unused defines. + * src/nano.h, src/proto.h: Delete some more unused stuff. 2014-04-16 Benno Schulenberg * src/winio.c (get_mouseinput): Properly find also the zeroeth diff --git a/src/nano.h b/src/nano.h index 8cb67345..b20f1332 100644 --- a/src/nano.h +++ b/src/nano.h @@ -419,15 +419,6 @@ typedef struct shortcut { /* Whether there should be a blank line after the help entry * text for this function. */ #endif - int ctrlval; - /* The special sentinel key or control key we want bound, if - * any. */ - int metaval; - /* The meta key we want bound, if any. */ - int funcval; - /* The function key we want bound, if any. */ - int miscval; - /* The other meta key we want bound, if any. */ bool viewok; /* Is this function allowed when in view mode? */ void (*func)(void); diff --git a/src/proto.h b/src/proto.h index 090b2022..0ee6a046 100644 --- a/src/proto.h +++ b/src/proto.h @@ -336,40 +336,25 @@ void save_poshistory(void); int check_poshistory(const char *file, ssize_t *line, ssize_t *column); #endif #ifndef DISABLE_COLOR -void do_linter(void); void set_lint_shortcuts(void); void set_spell_shortcuts(void); #endif -/* All functions in global.c. */ +/* Some functions in global.c. */ size_t length_of_list(int menu); -#ifndef NANO_TINY -void toggle_init_one(int val -#ifndef DISABLE_HELP - , const char *desc, bool blank_after -#endif - , long flag); -void toggle_init(void); -#endif -void sc_init_one(shortcut **shortcutage, int ctrlval, const char *desc -#ifndef DISABLE_HELP - , const char *help, bool blank_after -#endif - , int metaval, int funcval, int miscval, bool view, void - (*func)(void)); void shortcut_init(void); #ifdef DEBUG void thanks_for_all_the_fish(void); #endif /* All functions in help.c. */ -void do_help_void(void); #ifndef DISABLE_HELP void do_help(void (*refresh_func)(void)); void help_init(void); void parse_help_input(int *kbinput, bool *meta_key); size_t help_line_len(const char *ptr); #endif +void do_help_void(void); /* All functions in move.c. */ void do_first_line(void); @@ -687,6 +672,9 @@ const char *do_int_speller(const char *tempfile_name); const char *do_alt_speller(char *tempfile_name); void do_spell(void); #endif +#ifndef DISABLE_COLOR +void do_linter(void); +#endif #ifndef NANO_TINY void do_wordlinechar_count(void); #endif -- 2.39.5