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

Not dereferencing symlinks, so that the syntax will be derived from the 

name given on the command line, not from the name of the target file.
This fixes Savannah bug #47307.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5703 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-02-29 16:56:54 +00:00
parent e39423b49d
commit 83975027e5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,9 @@
* src/rcfile.c (parse_rcfile): Close an extended syntax again. * src/rcfile.c (parse_rcfile): Close an extended syntax again.
* src/rcfile.c (parse_rcfile): Rename a variable. * src/rcfile.c (parse_rcfile): Rename a variable.
* src/rcfile.c (grab_and_store): Fix breakage of r5695. * src/rcfile.c (grab_and_store): Fix breakage of r5695.
* src/color.c (color_update): Do not dereference symlinks, so that
the syntax will be derived from the name given on the command line,
not from that of the target file. This fixes Savannah bug #47307.
2016-02-28 Benno Schulenberg <bensberg@justemail.net> 2016-02-28 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c (parse_header_exp): Don't continue when something is * src/rcfile.c (parse_header_exp): Don't continue when something is

2
src/color.c
View File

@ -215,7 +215,7 @@ void color_update(void)
/* Concatenate the current working directory with the /* Concatenate the current working directory with the
* specified filename, and canonicalize the result. */ * specified filename, and canonicalize the result. */
sprintf(joinednames, "%s/%s", currentdir, openfile->filename); sprintf(joinednames, "%s/%s", currentdir, openfile->filename);
fullname = realpath(joinednames, NULL); fullname = get_full_path(joinednames);
free(currentdir); free(currentdir);
} }