mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correcting two comments, and tweaking two others. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4751 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2014-04-08 13:27:32 +00:00
parent d0dec31778
commit de597bce92
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2014-04-08 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c: Correct two comments, and tweak two others.
2014-04-08 David Lawrence Ramsey <pooka109@gmail.com> 2014-04-08 David Lawrence Ramsey <pooka109@gmail.com>
* src/nano.c (main): Convert the literal UTF-8 whitespace string into * src/nano.c (main): Convert the literal UTF-8 whitespace string into
its corresponding byte sequence, and add a comment for it. its corresponding byte sequence, and add a comment for it.

10
src/rcfile.c
View File

@ -113,7 +113,7 @@ static char *nanorc = NULL;
static syntaxtype *endsyntax = NULL; static syntaxtype *endsyntax = NULL;
/* The end of the list of syntaxes. */ /* The end of the list of syntaxes. */
static exttype *endheader = NULL; static exttype *endheader = NULL;
/* End of header list */ /* End of header list. */
static colortype *endcolor = NULL; static colortype *endcolor = NULL;
/* The end of the color list for the current syntax. */ /* The end of the color list for the current syntax. */
#endif #endif
@ -377,9 +377,7 @@ void parse_syntax(char *ptr)
} }
} }
/* Parse the magic regex that may influence the choice of syntax. */
/* Parse the next syntax string from the line at ptr, and add it to the
* global list of color syntaxes. */
void parse_magictype(char *ptr) void parse_magictype(char *ptr)
{ {
#ifdef HAVE_LIBMAGIC #ifdef HAVE_LIBMAGIC
@ -848,14 +846,14 @@ void parse_colors(char *ptr, bool icase)
newcolor->end_regex = (nregcomp(fgstr, icase ? REG_ICASE : newcolor->end_regex = (nregcomp(fgstr, icase ? REG_ICASE :
0)) ? mallocstrcpy(NULL, fgstr) : NULL; 0)) ? mallocstrcpy(NULL, fgstr) : NULL;
/* Lame way to skip another static counter */ /* Lame way to skip another static counter. */
newcolor->id = endsyntax->nmultis; newcolor->id = endsyntax->nmultis;
endsyntax->nmultis++; endsyntax->nmultis++;
} }
} }
} }
/* Parse the headers (1st line) of the file which may influence the regex used. */ /* Parse the header-line regex that may influence the choice of syntax. */
void parse_headers(char *ptr) void parse_headers(char *ptr)
{ {
char *regstr; char *regstr;