aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2003-08-19 16:20:13 +0000
committerMiles Bader2003-08-19 16:20:13 +0000
commit27eeee55f10efa90315127cd79e689d6aa32c736 (patch)
tree5d0b1ab3e59b2560aa1563b10e8d3822d6f54e59 /src
parentf4446bbf6f488f4ca028a513e37e95cbc79c91c4 (diff)
downloademacs-27eeee55f10efa90315127cd79e689d6aa32c736.tar.gz
emacs-27eeee55f10efa90315127cd79e689d6aa32c736.zip
Revision: miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-20
src/xterm.c (x_term_init): Correctly use result of Ffile_readable_p.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xterm.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 73e8de3aa71..2d69bcf912b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12003-08-19 Miles Bader <miles@gnu.org>
2
3 * xterm.c (x_term_init): Correctly use result of Ffile_readable_p.
4
12003-08-19 Gerd Moellmann <gerd@gnu.org> 52003-08-19 Gerd Moellmann <gerd@gnu.org>
2 6
3 * alloc.c (lisp_align_malloc): Check for memory full when 7 * alloc.c (lisp_align_malloc): Check for memory full when
diff --git a/src/xterm.c b/src/xterm.c
index 5463ce8e192..18f225182c8 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10194,7 +10194,7 @@ x_term_init (display_name, xrm_option, resource_name)
10194 s = make_string (file, strlen (file)); 10194 s = make_string (file, strlen (file));
10195 abs_file = Fexpand_file_name(s, Qnil); 10195 abs_file = Fexpand_file_name(s, Qnil);
10196 10196
10197 if (! NILP (abs_file) && Ffile_readable_p (abs_file)) 10197 if (! NILP (abs_file) && !NILP (Ffile_readable_p (abs_file)))
10198 gtk_rc_parse (SDATA (abs_file)); 10198 gtk_rc_parse (SDATA (abs_file));
10199 10199
10200 UNGCPRO; 10200 UNGCPRO;