mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-28 23:53:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allowing to select an empty syntax. And selecting the last

Browse Source 
instead of the first syntax that matches a certain magic string
(forgotten in the previous commit).


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5705 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-03-01 11:21:05 +00:00
parent 3df1a3f0f4
commit ce32cb0f6b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
bother discarding a duplicate syntax (it's too rare, saves little bother discarding a duplicate syntax (it's too rare, saves little
memory, and freeing it properly would cost even more code), just memory, and freeing it properly would cost even more code), just
select the last-defined one. This addresses Savannah bug #47303. select the last-defined one. This addresses Savannah bug #47303.
* src/color.c (color_update): Allow to select an empty syntax.
2016-02-29 Benno Schulenberg <bensberg@justemail.net> 2016-02-29 Benno Schulenberg <bensberg@justemail.net>
* src/nano.h, src/rcfile.c, src/color.c: Rename a struct member. * src/nano.h, src/rcfile.c, src/color.c: Rename a struct member.

11
src/color.c
View File

@ -196,14 +196,14 @@ void color_update(void)
} }
} }
if (openfile->colorstrings == NULL) if (openfile->syntax == NULL)
statusbar(_("Unknown syntax name: %s"), syntaxstr); statusbar(_("Unknown syntax name: %s"), syntaxstr);
} }
/* If we didn't specify a syntax override string, or if we did and /* If we didn't specify a syntax override string, or if we did and
* there was no syntax by that name, get the syntax based on the * there was no syntax by that name, get the syntax based on the
* file extension, then try the headerline, and then try magic. */ * file extension, then try the headerline, and then try magic. */
if (openfile->colorstrings == NULL) { if (openfile->syntax == NULL) {
char *currentdir = getcwd(NULL, PATH_MAX + 1); char *currentdir = getcwd(NULL, PATH_MAX + 1);
char *joinednames = charalloc(PATH_MAX + 1); char *joinednames = charalloc(PATH_MAX + 1);
char *fullname = NULL; char *fullname = NULL;
@ -230,7 +230,7 @@ void color_update(void)
free(fullname); free(fullname);
/* Check the headerline if the extension didn't match anything. */ /* Check the headerline if the extension didn't match anything. */
if (openfile->colorstrings == NULL) { if (openfile->syntax == NULL) {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "No result from file extension, trying headerline...\n"); fprintf(stderr, "No result from file extension, trying headerline...\n");
#endif #endif
@ -244,7 +244,7 @@ void color_update(void)
#ifdef HAVE_LIBMAGIC #ifdef HAVE_LIBMAGIC
/* Check magic if we don't have an answer yet. */ /* Check magic if we don't have an answer yet. */
if (openfile->colorstrings == NULL) { if (openfile->syntax == NULL) {
struct stat fileinfo; struct stat fileinfo;
magic_t cookie = NULL; magic_t cookie = NULL;
const char *magicstring = NULL; const char *magicstring = NULL;
@ -278,7 +278,6 @@ void color_update(void)
if (found_in_list(sint->magics, magicstring)) { if (found_in_list(sint->magics, magicstring)) {
openfile->syntax = sint; openfile->syntax = sint;
openfile->colorstrings = sint->color; openfile->colorstrings = sint->color;
break;
} }
} }
} }
@ -290,7 +289,7 @@ void color_update(void)
} }
/* If we didn't find any syntax yet, see if there is a default one. */ /* If we didn't find any syntax yet, see if there is a default one. */
if (openfile->colorstrings == NULL) { if (openfile->syntax == NULL) {
for (sint = syntaxes; sint != NULL; sint = sint->next) { for (sint = syntaxes; sint != NULL; sint = sint->next) {
if (strcmp(sint->name, "default") == 0) { if (strcmp(sint->name, "default") == 0) {
openfile->syntax = sint; openfile->syntax = sint;