2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb86544fa60..6fd7836c914 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/env.el b/lisp/env.el
index 8d8bebe09ba..33d5545edae 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -198,7 +198,9 @@ in the environment list of the selected frame."
                                     (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)