From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 14 Sep 2014 08:23:48 +0000 (+0200)
Subject: * callproc.c (init_callproc): Fix bug introduced at 2014-09-07.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~292
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f7ae02b8978b678b153488e246b3f0f3fc6a529;p=emacs.git

* callproc.c (init_callproc): Fix bug introduced at 2014-09-07.

Fixes: debbugs:18474
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cb3aa8c7fe3..015ed3618cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* callproc.c (init_callproc): Fix bug introduced at
+	2014-09-07 (Bug#18474).
+
 2014-09-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Prefer ptrdiff_t to int and avoid integer overflows.
diff --git a/src/callproc.c b/src/callproc.c
index c864471f504..798f441bdef 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1579,7 +1579,7 @@ init_callproc (void)
   Lisp_Object tempdir;
 #ifdef HAVE_NS
   if (data_dir == 0)
-    data_dir == ns_etc_directory () != 0;
+    data_dir = ns_etc_directory () != 0;
 #endif
 
   if (!NILP (Vinstallation_directory))