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

2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b18c04ece87..a650253f162 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2009-02-10  Dan Nicolaescu  <dann@ics.uci.edu>
+2009-02-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * server.el (server-with-environment):
+        Don't fail for negative entries in ENV.
+
+2009-02-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * 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.
diff --git a/lisp/server.el b/lisp/server.el
index f42be5821c0..cd9c5fa4ad8 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -240,9 +240,9 @@ ENV should be in the same format as `process-environment'."
     `(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))))