From ac6846a3e9aa4ead6dbbd9415ef65e0585c94f12 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 20 Jun 2014 10:39:31 +0000
Subject: [PATCH] Wrapping long lines and actually reporting the name that is
not a directory.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4994 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 2 ++
src/files.c | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b2b765ac..a7cb46c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2014-06-20 Benno Schulenberg <bensberg@justemail.net>
* src/proto.h, src/global.c: Remove two obsolete variables and an
unneeded extern, and regroup some stuff.
+ * src/files.c (check_dotnano): Wrap long lines and actually report
+ the name that is not a directory.
2014-06-19 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()'
diff --git a/src/files.c b/src/files.c
index e1e92a1a..dbf97f62 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2952,12 +2952,15 @@ int check_dotnano(void)
if (stat(nanodir, &dirstat) == -1) {
if (mkdir(nanodir, S_IRWXU | S_IRWXG | S_IRWXO) == -1) {
- history_error(N_("Unable to create directory %s: %s\nIt is required for saving/loading search history or cursor position\n"),
- nanodir, strerror(errno));
+ history_error(N_("Unable to create directory %s: %s\n"
+ "It is required for saving/loading search history or cursor positions.\n"),
+ nanodir, strerror(errno));
return 0;
}
} else if (!S_ISDIR(dirstat.st_mode)) {
- history_error(N_("Path %s is not a directory and needs to be.\nNano will be unable to load or save search or cursor position history\n"));
+ history_error(N_("Path %s is not a directory and needs to be.\n"
+ "Nano will be unable to load or save search history or cursor positions.\n"),
+ nanodir);
return 0;
}
return 1;
--
GitLab