[Emacs-diffs] trunk r114421: Fix bug #15426 with directory-files invoked from a unibyte buffer.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114421
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15426
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-09-21 14:48:19 +0300
message:
  Fix bug #15426 with directory-files invoked from a unibyte buffer.
  
   src/dired.c (directory_files_internal): Use multibyte_chars_in_text,
   not chars_in_text, whose result depends on the multibyteness of
   the current buffer.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dired.c                    dired.c-20091113204419-o5vbwnq5f7feedwu-171

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-20 20:23:20 +0000
+++ b/src/ChangeLog     2013-09-21 11:48:19 +0000
@@ -1,3 +1,9 @@
+2013-09-21  Eli Zaretskii  <address@hidden>
+
+       * dired.c (directory_files_internal): Use multibyte_chars_in_text,
+       not chars_in_text, whose result depends on the multibyteness of
+       the current buffer.  (Bug#15426)
+
 2013-09-20  Paul Eggert  <address@hidden>
 
        Port recent change to hosts where pointers aren't 'long'.

=== modified file 'src/dired.c'
--- a/src/dired.c       2013-07-16 21:35:45 +0000
+++ b/src/dired.c       2013-09-21 11:48:19 +0000
@@ -278,7 +278,7 @@
              memcpy (SDATA (fullname) + directory_nbytes + needsep,
                      SDATA (name), len);
 
-             nchars = chars_in_text (SDATA (fullname), nbytes);
+             nchars = multibyte_chars_in_text (SDATA (fullname), nbytes);
 
              /* Some bug somewhere.  */
              if (nchars > nbytes)