revert the conversion of each line to a valid multibyte string, as it

doesn't take encodings other than ASCII and Latin-1 into account and
hence isn't accurate enough

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

diff --git a/ChangeLog b/ChangeLog
index 9c8eeba5d3c42f9b32c798d9312e80cc150f4d85..d29abe6f891c79ac8c1ecb1d557e64a910afe37d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,10 +54,6 @@ CVS code -
          and NANO_APPEND_KEY are.  Changes to shortcut_init(), usage(),
          main(), search_init(), nanorc.sample, nano.1, nanorc.5,
          nano.texi, etc. (DLR)
-       - When reading a file in, make sure each line is a valid
-         multibyte string, unless the NO_CONVERT flag is set.  Note
-         that this is disabled when NANO_SMALL is defined.  Changes to
-         make_mbstring(), read_line(), and do_credits(). (DLR)
 - chars.c:
   make_mbstring()
        - Change erroneous ENABLE_EXTRA #ifdef to NANO_EXTRA to fix a

diff --git a/src/chars.c b/src/chars.c
index 5c808fc8a7274ee5f526dbc696d2ae9114a9c272..549ea0da6baea8d1536a20242a26f6b8d11b5d72 100644 (file)
--- a/src/chars.c
+++ b/src/chars.c
@@ -301,7 +301,7 @@ char *make_mbchar(int chr, int *chr_mb_len)
     return chr_mb;
 }
 
-#if !defined(NANO_SMALL) || defined(ENABLE_NANORC) || defined(NANO_EXTRA)
+#if defined(ENABLE_NANORC) || defined(NANO_EXTRA)
 /* Convert the string str to a valid multibyte string with the same wide
  * character values as str.  Return the (dynamically allocated)
  * multibyte string. */

diff --git a/src/files.c b/src/files.c
index d162fdf4af5090adda9b75d56648804c3998f125..e12e983ea6cbfe03b0e89f12c859c78afcdadfb2 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -77,16 +77,10 @@ filestruct *read_line(char *buf, filestruct *prevnode, bool
     fileptr->data = mallocstrcpy(NULL, buf);
 
 #ifndef NANO_SMALL
-    if (!ISSET(NO_CONVERT)) {
-       /* If it's a DOS file (CR LF), and file conversion isn't
-        * disabled, strip the CR part from fileptr->data. */
-       if (len > 0 && buf[len - 1] == '\r')
-           fileptr->data[len - 1] = '\0';
-
-       /* Make sure fileptr->data is a valid multibyte string. */
-       fileptr->data = mallocstrassn(fileptr->data,
-               make_mbstring(fileptr->data));
-    }
+    /* If it's a DOS file (CR LF), and file conversion isn't disabled,
+     * strip the CR part from fileptr->data. */
+    if (!ISSET(NO_CONVERT) && len > 0 && buf[len - 1] == '\r')
+       fileptr->data[len - 1] = '\0';
 #endif
 
     if (*first_line_ins || fileage == NULL) {