diff --git a/ChangeLog b/ChangeLog index 7952ceb71b60b95f796a53434929a357ef0b0d40..02d763813743d3bcc197b22f743e402f19bf231b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,9 @@ CVS code - do_gotolinecolumn(), do_delete(), and find_paragraph(). (DLR) - nano.h: - Readd MIN_EDITOR_COLS #define. (DLR) +- rcfile.c: + do_rcfile() + - Remove unneeded assert. (DLR) - winio.c: nanoget_repaint() - Rename parameter inputbuf to buf, for consistency. (DLR) diff --git a/src/rcfile.c b/src/rcfile.c index d5140c603f6a3d47b431c6488dd82b3473503cb3..0852eec66a9f6b84a9a89317df3eace601859765 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -733,14 +733,13 @@ void parse_rcfile(FILE *rcstream) return; } -/* The main rc file function, tries to open the rc file */ +/* The main rcfile function. It tries to open the system-wide rcfile, + * followed by the local rcfile. */ void do_rcfile(void) { FILE *rcstream; #ifdef SYSCONFDIR - assert(sizeof(SYSCONFDIR) == strlen(SYSCONFDIR) + 1); - nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc"); /* Try to open the system-wide nanorc. */ rcstream = fopen(nanorc, "r");