summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/callproc.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 94b48f64de3..efb96ce8494 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,11 @@
+2014-03-22 Glenn Morris <rgm@gnu.org>
+
+ * callproc.c (init_callproc): In etc, look for NEWS rather than GNU.
+
2014-03-22 Daniel Colascione <dancol@dancol.org>
* process.c (conv_sockaddr_to_lisp): When extracting the string
- names of AF_LOCAL sockets, stop before reading uninitialized
- memory.
+ names of AF_LOCAL sockets, stop before reading uninitialized memory.
2014-03-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
diff --git a/src/callproc.c b/src/callproc.c
index 2ce4a7dcc0d..0831291b0dd 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1617,13 +1617,13 @@ init_callproc (void)
srcdir = Fexpand_file_name (build_string ("../src/"), lispdir);
- tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory);
+ tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
tem1 = Ffile_exists_p (tem);
if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1))
{
Lisp_Object newdir;
newdir = Fexpand_file_name (build_string ("../etc/"), lispdir);
- tem = Fexpand_file_name (build_string ("GNU"), newdir);
+ tem = Fexpand_file_name (build_string ("NEWS"), newdir);
tem1 = Ffile_exists_p (tem);
if (!NILP (tem1))
Vdata_directory = newdir;