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

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/02/11 09:23:02

Modified files:
        lisp           : ChangeLog server.el 

Log message:
        * server.el (server-with-environment): Don't fail for negative entries 
in ENV.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15300&r2=1.15301
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.188&r2=1.189

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15300
retrieving revision 1.15301
diff -u -b -r1.15300 -r1.15301
--- ChangeLog   11 Feb 2009 08:44:19 -0000      1.15300
+++ ChangeLog   11 Feb 2009 09:22:59 -0000      1.15301
@@ -1,4 +1,9 @@
-2009-02-10  Dan Nicolaescu  <address@hidden>
+2009-02-11  Juanma Barranquero  <address@hidden>
+
+       * server.el (server-with-environment):
+       Don't fail for negative entries in ENV.
+
+2009-02-11  Dan Nicolaescu  <address@hidden>
 
        * vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
        (vc-default-dir-printer): Add a comment about updating this function.

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- server.el   7 Feb 2009 21:59:35 -0000       1.188
+++ server.el   11 Feb 2009 09:23:02 -0000      1.189
@@ -240,9 +240,9 @@
     `(let ((process-environment process-environment))
        (dolist (,var ,vars)
          (let ((,value (getenv-internal ,var ,env)))
-           (push (if (null ,value)
-                     ,var
-                   (concat ,var "=" ,value))
+           (push (if (stringp ,value)
+                     (concat ,var "=" ,value)
+                   ,var)
                  process-environment)))
        (progn ,@body))))