aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2011-03-17 16:44:02 +0100
committerJuanma Barranquero <[email protected]>2011-03-17 16:44:02 +0100
commit45763476fcc967a750bb2abe3bd7a43b7a19e537 (patch)
tree200fccde22283f915b04affa37e022c27834b6a9
parente4021ec1d72e0493b9f80230a9324c06d0579581 (diff)
src/xfaces.c (Fx_load_color_file): Read color file from absolute filename.
Fixes: debbugs:8250
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfaces.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7595816995..49b37a843b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-17 Juanma Barranquero <[email protected]>
+
+ * xfaces.c (Fx_load_color_file):
+ Read color file from absolute filename (bug#8250).
+
2011-03-11 Juanma Barranquero <[email protected]>
Backport revno:103582 from trunk.
diff --git a/src/xfaces.c b/src/xfaces.c
index e9e677d1b1..9956ef5584 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6625,7 +6625,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */)
CHECK_STRING (filename);
abspath = Fexpand_file_name (filename, Qnil);
- fp = fopen (SDATA (filename), "rt");
+ fp = fopen (SDATA (abspath), "rt");
if (fp)
{
char buf[512];