[Emacs-diffs] emacs/lisp ChangeLog env.el

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/02/10 10:25:01

Modified files:
        lisp           : ChangeLog env.el 

Log message:
        * env.el (getenv): When FRAME is non-nil, pass the frame environment
          to `getenv-internal', not the frame.  (Bug#2259)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15294&r2=1.15295
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/env.el?cvsroot=emacs&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15294
retrieving revision 1.15295
diff -u -b -r1.15294 -r1.15295
--- ChangeLog   10 Feb 2009 09:02:05 -0000      1.15294
+++ ChangeLog   10 Feb 2009 10:24:59 -0000      1.15295
@@ -1,3 +1,8 @@
+2009-02-10  Eric Hanchrow  <address@hidden>
+
+       * 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  <address@hidden>
 
        * descr-text.el (describe-char-display): On terminal, if terminal

Index: env.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/env.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- env.el      24 Jan 2009 16:19:06 -0000      1.48
+++ env.el      10 Feb 2009 10:25:01 -0000      1.49
@@ -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)