Merge changes from emacs-23 branch

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8cbcaf4afbc..5aee468d933 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
 
+        * xfaces.c (Fx_load_color_file):
+        Read color file from absolute filename (bug#8250).
+
+2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
         * makefile.w32-in: Update dependencies.
 
 2011-03-17  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/xfaces.c b/src/xfaces.c
index 50bcab3c6a9..0fc5dd6f8a3 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6297,7 +6297,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];