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

tweaks: recognize the empty string as comment inhibitor, instead of NULL

master
Benno Schulenberg 2017-07-06 21:59:40 +02:00
parent 79971a309f
commit 1439016c20
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nano.h
View File

@ -220,8 +220,10 @@ typedef struct syntaxtype {
/* The command with which to lint this type of file. */
char *formatter;
/* The formatting command (for programming languages mainly). */
#ifdef ENABLE_COMMENT
char *comment;
/* The line comment prefix (and postfix) for this type of file. */
#endif
colortype *color;
/* The colors and their regexes used in this syntax. */
int nmultis;

8
src/rcfile.c
View File

@ -317,8 +317,6 @@ void parse_syntax(char *ptr)
live_syntax->formatter = NULL;
#ifdef ENABLE_COMMENT
live_syntax->comment = mallocstrcpy(NULL, GENERAL_COMMENT_CHARACTER);
#else
live_syntax->comment = NULL;
#endif
live_syntax->color = NULL;
lastcolor = NULL;
@ -894,11 +892,7 @@ void pick_up_name(const char *kind, char *ptr, char **storage)
*look = '\0';
}
if (*ptr == '\0') {
free(*storage);
*storage = NULL;
} else
*storage = mallocstrcpy(*storage, ptr);
*storage = mallocstrcpy(*storage, ptr);
}
#endif /* !DISABLE_COLOR */

3
src/text.c
View File

@ -470,8 +470,7 @@ void do_comment(void)
if (openfile->syntax)
comment_seq = openfile->syntax->comment;
/* Does the syntax not allow comments? */
if (comment_seq == NULL) {
if (*comment_seq == '\0') {
statusbar(_("Commenting is not supported for this file type"));
return;
}