commit 9e71de12cd3da7e8af8b467730182e7cb8368286
parent c7affe17c04447a0c026952d2c4548b55968466a
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Sun, 2 Sep 2018 13:02:50 +0200
tweaks: improve a translator hint and some other comments
Diffstat:
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/files.c b/src/files.c
@@ -619,7 +619,7 @@ void mention_name_and_linecount(void)
(openfile->filebot->data[0] == '\0' ? 1 : 0);
#ifndef NANO_TINY
if (openfile->fmt != NIX_FILE)
- /* TRANSLATORS: first %s is the file name, second %s a format indicator. */
+ /* TRANSLATORS: first %s is file name, second %s is file format. */
statusline(HUSH, P_("%s -- %zu line (%s)", "%s -- %zu lines (%s)", count),
openfile->filename[0] == '\0' ?
_("New Buffer") : tail(openfile->filename), count,
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -1222,9 +1222,8 @@ void do_rcfiles(void)
{
const char *xdgconfdir;
+ /* First process the system-wide nanorc, if there is one. */
nanorc = mallocstrcpy(nanorc, SYSCONFDIR "/nanorc");
-
- /* Process the system-wide nanorc. */
parse_one_nanorc();
/* When configured with --disable-wrapping-as-root, turn wrapping off
@@ -1237,8 +1236,8 @@ void do_rcfiles(void)
get_homedir();
xdgconfdir = getenv("XDG_CONFIG_HOME");
- /* Now try the to find a nanorc file in the user's home directory
- * or in the XDG configuration directories. */
+ /* Now try the to find a nanorc file in the user's home directory or in
+ * the XDG configuration directories, and process the first one found. */
if (have_nanorc(homedir, "/" HOME_RC_NAME))
parse_one_nanorc();
else if (have_nanorc(xdgconfdir, "/nano/" RCFILE_NAME))