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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/03/10 00:49:48

Index: src/fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -b -r1.605 -r1.606
--- src/fileio.c        27 Feb 2008 04:10:15 -0000      1.605
+++ src/fileio.c        10 Mar 2008 00:49:44 -0000      1.606
@@ -2224,8 +2224,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 == '}')