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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        08/03/07 15:42:31

Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.580.2.10
retrieving revision 1.580.2.11
diff -u -b -r1.580.2.10 -r1.580.2.11
--- fileio.c    5 Mar 2008 10:05:42 -0000       1.580.2.10
+++ fileio.c    7 Mar 2008 15:42:30 -0000       1.580.2.11
@@ -2226,8 +2226,8 @@
        /* 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 == '}')