Mercurial > emacs

diff src/fileio.c @ 92692:d999f30304bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1095
author Miles Bader <miles@gnu.org>
date Mon, 10 Mar 2008 00:49:47 +0000
parents c03d2269686e 7a2d0126392f
children 6d11337f1ad8
line wrap: on
line diff
--- a/src/fileio.c	Sun Mar 09 21:37:16 2008 +0000
+++ b/src/fileio.c	Mon Mar 10 00:49:47 2008 +0000
@@ -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 == '}')