[Emacs-diffs] Changes to emacs/src/dired.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/19 03:09:47

Index: dired.c
===================================================================
RCS file: /sources/emacs/emacs/src/dired.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- dired.c     18 Apr 2008 02:56:42 -0000      1.139
+++ dired.c     19 Apr 2008 03:09:47 -0000      1.140
@@ -193,8 +193,10 @@
   /* Note: ENCODE_FILE and DECODE_FILE can GC because they can run
      run_pre_post_conversion_on_str which calls Lisp directly and
      indirectly.  */
+  if (STRING_MULTIBYTE (dirfilename))
   dirfilename = ENCODE_FILE (dirfilename);
-  encoded_directory = ENCODE_FILE (directory);
+  encoded_directory = (STRING_MULTIBYTE (directory)
+                      ? ENCODE_FILE (directory) : directory);
 
   /* Now *bufp is the compiled form of MATCH; don't call anything
      which might compile a new regexp until we're done with the loop!  */
@@ -251,7 +253,7 @@
          name = finalname = make_unibyte_string (dp->d_name, len);
          GCPRO2 (finalname, name);
 
-         /* Note: ENCODE_FILE can GC; it should protect its argument,
+         /* Note: DECODE_FILE can GC; it should protect its argument,
             though.  */
          name = DECODE_FILE (name);
          len = SBYTES (name);
@@ -506,7 +508,7 @@
   /* Do completion on the encoded file name
      because the other names in the directory are (we presume)
      encoded likewise.  We decode the completed string at the end.  */
-  encoded_file = ENCODE_FILE (file);
+  encoded_file = STRING_MULTIBYTE (file) ? ENCODE_FILE (file) : file;
 
   encoded_dir = ENCODE_FILE (dirname);