From 336d1b8902eae3ad17e39988dc3af075e636dac6 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 18 Jun 2014 20:43:05 +0000 Subject: [PATCH] Renaming 'function_type' to 'key_type', for clarity. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4983 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/global.c | 4 ++-- src/nano.h | 6 +++--- src/proto.h | 2 +- src/rcfile.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd83f5c0..ed3748ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * src/text.c: Upon better thought, elide the unneeded 'to_eof'. * src/text.c: And elide a totally unused 'strdata2'. * src/text.c: Rename the undo type UNSPLIT to JOIN, for clarity. + * src/global.c, src/rcfile.c: Rename function_type to key_type. 2014-06-18 Mark Majeres * src/text.c (add_undo): Don't start a new undo for CUT when the diff --git a/src/global.c b/src/global.c index b79d8058..f48bf560 100644 --- a/src/global.c +++ b/src/global.c @@ -278,8 +278,8 @@ void flip_execute_void(void) { } -/* Set type of function based on the string. */ -function_type strtokeytype(const char *str) +/* Set the type of command key based on the string. */ +key_type strtokeytype(const char *str) { if (str[0] == '^') return CONTROL; diff --git a/src/nano.h b/src/nano.h index d4d81ed4..dd8a1b26 100644 --- a/src/nano.h +++ b/src/nano.h @@ -184,7 +184,7 @@ typedef enum { typedef enum { CONTROL, META, FKEY, RAWINPUT -} function_type; +} key_type; typedef enum { ADD, DEL, BACK, CUT, CUT_EOF, REPLACE, @@ -447,8 +447,8 @@ typedef struct rcoption { typedef struct sc { char *keystr; /* The shortcut key for a function, ASCII version. */ - function_type type; - /* What kind of function key it is, for convenience later. */ + key_type type; + /* What kind of command key it is, for convenience later. */ int seq; /* The actual sequence to check on the type is determined. */ int menu; diff --git a/src/proto.h b/src/proto.h index 97b62b29..63607ac1 100644 --- a/src/proto.h +++ b/src/proto.h @@ -801,7 +801,7 @@ const subnfunc *sctofunc(sc *s); const subnfunc *getfuncfromkey(WINDOW *win); void print_sclist(void); sc *strtosc(char *input); -function_type strtokeytype(const char *str); +key_type strtokeytype(const char *str); int strtomenu(char *input); void assign_keyinfo(sc *s); void xon_complaint(void); diff --git a/src/rcfile.c b/src/rcfile.c index 719db882..24ba1aa7 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -382,7 +382,7 @@ void parse_syntax(char *ptr) int check_bad_binding(sc *s) { #define BADLISTLEN 1 - function_type badtypes[BADLISTLEN] = {META}; + key_type badtypes[BADLISTLEN] = {META}; int badseqs[BADLISTLEN] = { 91 }; int i; -- 2.39.5