Mercurial > emacs
comparison src/fileio.c @ 92692:d999f30304bc
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 |
comparison
equal
deleted
inserted
replaced
92691:0574109ed8bc | 92692:d999f30304bc |
---|---|
2222 #endif /* DOS_NT */ | 2222 #endif /* DOS_NT */ |
2223 | 2223 |
2224 /* Get variable value */ | 2224 /* Get variable value */ |
2225 o = (unsigned char *) egetenv (target); | 2225 o = (unsigned char *) egetenv (target); |
2226 if (o) | 2226 if (o) |
2227 { | 2227 { /* Eight-bit chars occupy upto 2 bytes in multibyte. */ |
2228 total += strlen (o); | 2228 total += strlen (o) * (STRING_MULTIBYTE (filename) ? 2 : 1); |
2229 substituted = 1; | 2229 substituted = 1; |
2230 } | 2230 } |
2231 else if (*p == '}') | 2231 else if (*p == '}') |
2232 goto badvar; | 2232 goto badvar; |
2233 } | 2233 } |