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

diff --git a/ChangeLog b/ChangeLog
index b2b765acdd8f2335f97d87f94e95e9e071a5e2ee..a7cb46c1df8192cf668f19e74a0474a836439099 100644 (file)
--- 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 e1e92a1aa71e144b5cc0cdb2d860cab9f37c51b3..dbf97f6255509bad860819796a5784c5d9c52525 100644 (file)
--- 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;