ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix compilation for --enable-tiny --enable-histories

master
Benno Schulenberg 2019-11-25 19:17:41 +01:00
parent 8637acb106
commit 3ffefbfddc
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.c
View File

@ -260,7 +260,9 @@ int menusymbols[NUMBER_OF_MENUS] = { MMAIN, MWHEREIS, MREPLACE, MREPLACEWITH,
MEXTCMD, MHELP, MSPELL, MLINTER, MEXTCMD, MHELP, MSPELL, MLINTER,
MBROWSER, MWHEREISFILE, MGOTODIR, MBROWSER, MWHEREISFILE, MGOTODIR,
MMOST|MBROWSER|MHELP|MYESNO }; MMOST|MBROWSER|MHELP|MYESNO };
#endif
#if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
char *startup_problem = NULL; char *startup_problem = NULL;
/* An error message (if any) about nanorc files or history files. */ /* An error message (if any) about nanorc files or history files. */
#endif #endif

2
src/nano.c
View File

@ -504,7 +504,7 @@ void finish(void)
/* Restore the old terminal settings. */ /* Restore the old terminal settings. */
tcsetattr(0, TCSANOW, &original_state); tcsetattr(0, TCSANOW, &original_state);
#ifdef ENABLE_NANORC #if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
display_rcfile_errors(); display_rcfile_errors();
#endif #endif

6
src/proto.h
View File

@ -173,7 +173,7 @@ extern int interface_color_pair[NUMBER_OF_ELEMENTS];
extern char *homedir; extern char *homedir;
extern char *statedir; extern char *statedir;
#ifdef ENABLE_NANORC #if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
extern char *startup_problem; extern char *startup_problem;
#endif #endif
@ -470,9 +470,11 @@ int do_prompt(bool allow_tabs, bool allow_files,
int do_yesno_prompt(bool all, const char *msg); int do_yesno_prompt(bool all, const char *msg);
/* Most functions in rcfile.c. */ /* Most functions in rcfile.c. */
#ifdef ENABLE_NANORC #if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
void display_rcfile_errors(void); void display_rcfile_errors(void);
void jot_error(const char *msg, ...); void jot_error(const char *msg, ...);
#endif
#ifdef ENABLE_NANORC
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
void parse_one_include(char *file, syntaxtype *syntax); void parse_one_include(char *file, syntaxtype *syntax);
void grab_and_store(const char *kind, char *ptr, regexlisttype **storage); void grab_and_store(const char *kind, char *ptr, regexlisttype **storage);

10
src/rcfile.c
View File

@ -146,7 +146,9 @@ static bool seen_color_command = FALSE;
static colortype *lastcolor = NULL; static colortype *lastcolor = NULL;
/* The end of the color list for the current syntax. */ /* The end of the color list for the current syntax. */
#endif #endif
#endif /* ENABLE_NANORC */
#if defined(ENABLE_NANORC) || defined(ENABLE_HISTORIES)
static linestruct *errors_head = NULL; static linestruct *errors_head = NULL;
static linestruct *errors_tail = NULL; static linestruct *errors_tail = NULL;
/* Beginning and end of a list of errors in rcfiles, if any. */ /* Beginning and end of a list of errors in rcfiles, if any. */
@ -175,17 +177,19 @@ void jot_error(const char *msg, ...)
errors_tail = error; errors_tail = error;
if (startup_problem == NULL) { if (startup_problem == NULL) {
#ifdef ENABLE_NANORC
if (nanorc != NULL) { if (nanorc != NULL) {
snprintf(textbuf, MAXSIZE, _("Mistakes in '%s'"), nanorc); snprintf(textbuf, MAXSIZE, _("Mistakes in '%s'"), nanorc);
startup_problem = copy_of(textbuf); startup_problem = copy_of(textbuf);
} else } else
#endif
startup_problem = copy_of(_("Problems with history file")); startup_problem = copy_of(_("Problems with history file"));
} }
#ifdef ENABLE_NANORC
if (lineno > 0) if (lineno > 0)
length = snprintf(textbuf, MAXSIZE, _("Error in %s on line %zu: "), length = snprintf(textbuf, MAXSIZE, _("Error in %s on line %zu: "),
nanorc, lineno); nanorc, lineno);
#endif
va_start(ap, msg); va_start(ap, msg);
length += vsnprintf(textbuf + length, MAXSIZE - length, _(msg), ap); length += vsnprintf(textbuf + length, MAXSIZE - length, _(msg), ap);
va_end(ap); va_end(ap);
@ -193,7 +197,9 @@ void jot_error(const char *msg, ...)
error->data = nmalloc(length + 1); error->data = nmalloc(length + 1);
sprintf(error->data, "%s", textbuf); sprintf(error->data, "%s", textbuf);
} }
#endif /* ENABLE_NANORC || ENABLE_HISTORIES */
#ifdef ENABLE_NANORC
/* Parse the next word from the string, null-terminate it, and return /* Parse the next word from the string, null-terminate it, and return
* a pointer to the first character after the null terminator. The * a pointer to the first character after the null terminator. The
* returned pointer will point to '\0' if we hit the end of the line. */ * returned pointer will point to '\0' if we hit the end of the line. */