Merge from emacs--rel--22

[gnu-emacs] / src / fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index 4430cf4db57964057a6cb97ad23e882e985df59c..f478b4a1fada0ba5e3ced3e9bd2d0e53e49f574d 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2224,8 +2224,8 @@ duplicates what `expand-file-name' does.  */)
        /* Get variable value */
        o = (unsigned char *) egetenv (target);
        if (o)
-         {
-           total += strlen (o);
+         { /* Eight-bit chars occupy upto 2 bytes in multibyte.  */
+           total += strlen (o) * (STRING_MULTIBYTE (filename) ? 2 : 1);
            substituted = 1;
          }
        else if (*p == '}')