Mercurial > emacs

changeset 101942:48d0501a9a76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* server.el (server-with-environment): Don't fail for negative entries in ENV.
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 11 Feb 2009 09:22:59 +0000
parents 7ea1de620645
children 97c9e9322753
files lisp/ChangeLog lisp/server.el
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Feb 11 08:44:18 2009 +0000
+++ b/lisp/ChangeLog	Wed Feb 11 09:22:59 2009 +0000
@@ -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.
--- a/lisp/server.el	Wed Feb 11 08:44:18 2009 +0000
+++ b/lisp/server.el	Wed Feb 11 09:22:59 2009 +0000
@@ -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))))