mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-26 06:39:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming 'function_type' to 'key_type', for clarity.

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4983 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-06-18 20:43:05 +00:00
parent 45fe2adf72
commit 336d1b8902
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
* src/text.c: Upon better thought, elide the unneeded 'to_eof'. * src/text.c: Upon better thought, elide the unneeded 'to_eof'.
* src/text.c: And elide a totally unused 'strdata2'. * src/text.c: And elide a totally unused 'strdata2'.
* src/text.c: Rename the undo type UNSPLIT to JOIN, for clarity. * 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> 2014-06-18 Mark Majeres <mark@engine12.com>
* src/text.c (add_undo): Don't start a new undo for CUT when the * src/text.c (add_undo): Don't start a new undo for CUT when the

4
src/global.c
View File

@ -278,8 +278,8 @@ void flip_execute_void(void)
{ {
} }
/* Set type of function based on the string. */ /* Set the type of command key based on the string. */
function_type strtokeytype(const char *str) key_type strtokeytype(const char *str)
{ {
if (str[0] == '^') if (str[0] == '^')
return CONTROL; return CONTROL;

6
src/nano.h
View File

@ -184,7 +184,7 @@ typedef enum {
typedef enum { typedef enum {
CONTROL, META, FKEY, RAWINPUT CONTROL, META, FKEY, RAWINPUT
} function_type; } key_type;
typedef enum { typedef enum {
ADD, DEL, BACK, CUT, CUT_EOF, REPLACE, ADD, DEL, BACK, CUT, CUT_EOF, REPLACE,
@ -447,8 +447,8 @@ typedef struct rcoption {
typedef struct sc { typedef struct sc {
char *keystr; char *keystr;
/* The shortcut key for a function, ASCII version. */ /* The shortcut key for a function, ASCII version. */
function_type type; key_type type;
/* What kind of function key it is, for convenience later. */ /* What kind of command key it is, for convenience later. */
int seq; int seq;
/* The actual sequence to check on the type is determined. */ /* The actual sequence to check on the type is determined. */
int menu; int menu;

2
src/proto.h
View File

@ -801,7 +801,7 @@ const subnfunc *sctofunc(sc *s);
const subnfunc *getfuncfromkey(WINDOW *win); const subnfunc *getfuncfromkey(WINDOW *win);
void print_sclist(void); void print_sclist(void);
sc *strtosc(char *input); sc *strtosc(char *input);
function_type strtokeytype(const char *str); key_type strtokeytype(const char *str);
int strtomenu(char *input); int strtomenu(char *input);
void assign_keyinfo(sc *s); void assign_keyinfo(sc *s);
void xon_complaint(void); void xon_complaint(void);

2
src/rcfile.c
View File

@ -382,7 +382,7 @@ void parse_syntax(char *ptr)
int check_bad_binding(sc *s) int check_bad_binding(sc *s)
{ {
#define BADLISTLEN 1 #define BADLISTLEN 1
function_type badtypes[BADLISTLEN] = {META}; key_type badtypes[BADLISTLEN] = {META};
int badseqs[BADLISTLEN] = { 91 }; int badseqs[BADLISTLEN] = { 91 };
int i; int i;