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

diff --git a/ChangeLog b/ChangeLog
index bd83f5c0f0c882e5ad90ac89cf5e4fe6e2e5f6be..ed3748ead6f6af52217ac228654cac3777018892 100644 (file)
--- 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  <mark@engine12.com>
        * 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 b79d8058dad40b3ab88d6c590c6e7a8b05fe0d42..f48bf560ef400a1c79813d06952db163c20b01a6 100644 (file)
--- 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 d4d81ed44aab161d1e88a6dcbfe75d9c488df516..dd8a1b2636a5cfe53e564508fae89de10894a95e 100644 (file)
--- 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 97b62b29fd940e6e51e9c9417cfc3e6e211fde57..63607ac1709494047da20a7f2621f6fa71798672 100644 (file)
--- 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 719db8826771c527b6f46e38187ac7f61079dee7..24ba1aa7d426af4ad4130acea995ee5073835f00 100644 (file)
--- 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;