Adjusting some tabbing and spacing.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4785 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
e167afe14d
commit
5df7c0dea5
|
@ -9,6 +9,7 @@
|
||||||
to be more accurate.
|
to be more accurate.
|
||||||
* src/nano.h, src/global.c, src/help.c, src/search.c: Rename
|
* src/nano.h, src/global.c, src/help.c, src/search.c: Rename
|
||||||
MREPLACE2 to MREPLACEWITH, for clarity.
|
MREPLACE2 to MREPLACEWITH, for clarity.
|
||||||
|
* src/nano.h: Adjust some tabbing and spacing.
|
||||||
|
|
||||||
2014-04-15 Benno Schulenberg <bensberg@justemail.net>
|
2014-04-15 Benno Schulenberg <bensberg@justemail.net>
|
||||||
* src/nano.c (precalc_multicolorinfo): Actually set the intended
|
* src/nano.c (precalc_multicolorinfo): Actually set the intended
|
||||||
|
|
50
src/nano.h
50
src/nano.h
|
@ -345,7 +345,7 @@ typedef struct undo {
|
||||||
|
|
||||||
typedef struct poshiststruct {
|
typedef struct poshiststruct {
|
||||||
char *filename;
|
char *filename;
|
||||||
/* The file. */
|
/* The file. */
|
||||||
ssize_t lineno;
|
ssize_t lineno;
|
||||||
/* Line number we left off on. */
|
/* Line number we left off on. */
|
||||||
ssize_t xno;
|
ssize_t xno;
|
||||||
|
@ -395,7 +395,7 @@ typedef struct openfilestruct {
|
||||||
/* The current (i.e. next) level of undo. */
|
/* The current (i.e. next) level of undo. */
|
||||||
undo_type last_action;
|
undo_type last_action;
|
||||||
const char *lock_filename;
|
const char *lock_filename;
|
||||||
/* The path of the lockfile, if we created one. */
|
/* The path of the lockfile, if we created one. */
|
||||||
#endif
|
#endif
|
||||||
#ifndef DISABLE_COLOR
|
#ifndef DISABLE_COLOR
|
||||||
syntaxtype *syntax;
|
syntaxtype *syntax;
|
||||||
|
@ -452,20 +452,20 @@ 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;
|
function_type type;
|
||||||
/* What kind of function key it is, for convenience later. */
|
/* What kind of function 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;
|
||||||
/* What list this applies to. */
|
/* What list this applies to. */
|
||||||
void (*scfunc)(void);
|
void (*scfunc)(void);
|
||||||
/* The function we're going to run. */
|
/* The function we're going to run. */
|
||||||
int toggle;
|
int toggle;
|
||||||
/* If a toggle, what we're toggling. */
|
/* If a toggle, what we're toggling. */
|
||||||
bool execute;
|
bool execute;
|
||||||
/* Whether to execute the function in question or just return
|
/* Whether to execute the function in question or just return
|
||||||
* so the sequence can be caught by the calling code. */
|
* so the sequence can be caught by the calling code. */
|
||||||
struct sc *next;
|
struct sc *next;
|
||||||
/* Next in the list. */
|
/* Next in the list. */
|
||||||
} sc;
|
} sc;
|
||||||
|
|
||||||
typedef struct subnfunc {
|
typedef struct subnfunc {
|
||||||
|
@ -483,7 +483,7 @@ typedef struct subnfunc {
|
||||||
* text for this function. */
|
* text for this function. */
|
||||||
#endif
|
#endif
|
||||||
bool viewok;
|
bool viewok;
|
||||||
/* Is this function allowed when in view mode? */
|
/* Is this function allowed when in view mode? */
|
||||||
long toggle;
|
long toggle;
|
||||||
/* If this is a toggle, if nonzero what toggle to set. */
|
/* If this is a toggle, if nonzero what toggle to set. */
|
||||||
struct subnfunc *next;
|
struct subnfunc *next;
|
||||||
|
@ -537,23 +537,23 @@ enum
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Flags for the menus in which a given function should be present. */
|
/* Flags for the menus in which a given function should be present. */
|
||||||
#define MMAIN (1<<0)
|
#define MMAIN (1<<0)
|
||||||
#define MWHEREIS (1<<1)
|
#define MWHEREIS (1<<1)
|
||||||
#define MREPLACE (1<<2)
|
#define MREPLACE (1<<2)
|
||||||
#define MREPLACEWITH (1<<3)
|
#define MREPLACEWITH (1<<3)
|
||||||
#define MGOTOLINE (1<<4)
|
#define MGOTOLINE (1<<4)
|
||||||
#define MWRITEFILE (1<<5)
|
#define MWRITEFILE (1<<5)
|
||||||
#define MINSERTFILE (1<<6)
|
#define MINSERTFILE (1<<6)
|
||||||
#define MEXTCMD (1<<7)
|
#define MEXTCMD (1<<7)
|
||||||
#define MHELP (1<<8)
|
#define MHELP (1<<8)
|
||||||
#define MSPELL (1<<9)
|
#define MSPELL (1<<9)
|
||||||
#define MBROWSER (1<<10)
|
#define MBROWSER (1<<10)
|
||||||
#define MWHEREISFILE (1<<11)
|
#define MWHEREISFILE (1<<11)
|
||||||
#define MGOTODIR (1<<12)
|
#define MGOTODIR (1<<12)
|
||||||
#define MYESNO (1<<13)
|
#define MYESNO (1<<13)
|
||||||
#define MLINTER (1<<14)
|
#define MLINTER (1<<14)
|
||||||
/* This is an abbreviation for all menus except Help and YesNo. */
|
/* This is an abbreviation for all menus except Help and YesNo. */
|
||||||
#define MMOST (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MSPELL|MLINTER)
|
#define MMOST (MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MSPELL|MLINTER)
|
||||||
|
|
||||||
/* Control key sequences. Changing these would be very, very bad. */
|
/* Control key sequences. Changing these would be very, very bad. */
|
||||||
#define NANO_CONTROL_SPACE 0
|
#define NANO_CONTROL_SPACE 0
|
||||||
|
|
Loading…
Reference in New Issue