Using prettier whitespace characters when in a UTF-8 locale.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4644 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index c55a2c4bb17f31e1993cbfbc868b0b6c571d5da9..7a61a29378de9ebfda221acf9aab6ca83fc34766 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-14  Benno Schulenberg  <bensberg@justemail.net>
+       * src/nano.c (main) - When in a UTF-8 locale, use prettier characters
+       (»·) for indicating whitespace, and for similarity use ">." instead of
+       ":." when not in a UTF-8 locale.  Changes suggested by Mike Frysinger.
+
 2014-03-05  Benno Schulenberg  <bensberg@justemail.net>
        * src/move.c (do_down) - Initialize the correct variable to zero.
        Solves jumpy scrolling behaviour reported by Chris Allegretta .

diff --git a/src/nano.c b/src/nano.c
index 297376dcdb0d23daa68f5011e1fb4b00f108d031..884b05a29514af0e3dbe482960854917e4a6b417 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2576,11 +2576,16 @@ int main(int argc, char **argv)
 
 #if !defined(NANO_TINY) && defined(ENABLE_NANORC)
     /* If whitespace wasn't specified, set its default value. */
-    if (whitespace == NULL) {
-       whitespace = mallocstrcpy(NULL, ":.");
-       whitespace_len[0] = 1;
-       whitespace_len[1] = 1;
-    }
+    if (whitespace == NULL)
+       if (using_utf8()) {
+           whitespace = mallocstrcpy(NULL, "»·");
+           whitespace_len[0] = 2;
+           whitespace_len[1] = 2;
+       } else {
+           whitespace = mallocstrcpy(NULL, ">.");
+           whitespace_len[0] = 1;
+           whitespace_len[1] = 1;
+       }
 #endif
 
     /* If tabsize wasn't specified, set its default value. */