aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2014-09-14 10:23:48 +0200
committerJan Djärv2014-09-14 10:23:48 +0200
commit3f7ae02b8978b678b153488e246b3f0f3fc6a529 (patch)
tree8ffcd0a6fc13b23c049de2f4b17588f525770d29 /src
parent24acbc31d25b4e308faa9f06caa09553087652ed (diff)
downloademacs-3f7ae02b8978b678b153488e246b3f0f3fc6a529.tar.gz
emacs-3f7ae02b8978b678b153488e246b3f0f3fc6a529.zip
* callproc.c (init_callproc): Fix bug introduced at 2014-09-07.
Fixes: debbugs:18474
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/callproc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cb3aa8c7fe3..015ed3618cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-09-14 Jan Djärv <jan.h.d@swipnet.se>
2
3 * callproc.c (init_callproc): Fix bug introduced at
4 2014-09-07 (Bug#18474).
5
12014-09-13 Dmitry Antipov <dmantipov@yandex.ru> 62014-09-13 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Prefer ptrdiff_t to int and avoid integer overflows. 8 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)
1579 Lisp_Object tempdir; 1579 Lisp_Object tempdir;
1580#ifdef HAVE_NS 1580#ifdef HAVE_NS
1581 if (data_dir == 0) 1581 if (data_dir == 0)
1582 data_dir == ns_etc_directory () != 0; 1582 data_dir = ns_etc_directory () != 0;
1583#endif 1583#endif
1584 1584
1585 if (!NILP (Vinstallation_directory)) 1585 if (!NILP (Vinstallation_directory))