diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2012-02-21 21:52:09 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2012-02-21 21:52:55 +0100 |
| commit | b561eedd8b1d70a2b3339d167348771f1a8fc5c7 (patch) | |
| tree | a7d7d32a90f391767a921a5fcdb59551cdffa04e /Src/params.c | |
| parent | 340a3b41e51e3f39249a9e28f0615b063f073a3c (diff) | |
| parent | 5f25bb8223d090d13af5869893fa35e5b8c44182 (diff) | |
| download | zsh-b561eedd8b1d70a2b3339d167348771f1a8fc5c7.tar.gz zsh-b561eedd8b1d70a2b3339d167348771f1a8fc5c7.zip | |
New upstream release
Merge branch 'upstream' into debian
Diffstat (limited to 'Src/params.c')
| -rw-r--r-- | Src/params.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Src/params.c b/Src/params.c index 446cccc7e..59d5daf2f 100644 --- a/Src/params.c +++ b/Src/params.c @@ -3788,6 +3788,10 @@ static void setlang(char *x) { struct localename *ln; + char *x2; + + if ((x2 = getsparam("LC_ALL")) && *x2) + return; /* * Set the global locale to the value passed, but override |