Mercurial > emacs
changeset 101930:a7b014166b41
* env.el (getenv): When FRAME is non-nil, pass the frame environment
to `getenv-internal', not the frame. (Bug#2259)
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 10 Feb 2009 10:24:59 +0000 |
| parents | 2de827642b1f |
| children | 8e4895e46810 |
| files | lisp/ChangeLog lisp/env.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 10 09:02:05 2009 +0000 +++ b/lisp/ChangeLog Tue Feb 10 10:24:59 2009 +0000 @@ -1,3 +1,8 @@ +2009-02-10 Eric Hanchrow <eric.hanchrow@gmail.com> + + * env.el (getenv): When FRAME is non-nil, pass the frame environment + to `getenv-internal', not the frame. (Bug#2259) + 2009-02-10 Kenichi Handa <handa@m17n.org> * descr-text.el (describe-char-display): On terminal, if terminal
--- a/lisp/env.el Tue Feb 10 09:02:05 2009 +0000 +++ b/lisp/env.el Tue Feb 10 10:24:59 2009 +0000 @@ -198,7 +198,9 @@ (encode-coding-string variable locale-coding-system) variable) - frame))) + (and frame + (assq 'environment + (frame-parameters frame)))))) (if (and enable-multibyte-characters value) (setq value (decode-coding-string value locale-coding-system))) (when (interactive-p)