diff options
| author | Juanma Barranquero | 2011-03-17 16:44:02 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-03-17 16:44:02 +0100 |
| commit | 45763476fcc967a750bb2abe3bd7a43b7a19e537 (patch) | |
| tree | 200fccde22283f915b04affa37e022c27834b6a9 /src | |
| parent | e4021ec1d72e0493b9f80230a9324c06d0579581 (diff) | |
| download | emacs-45763476fcc967a750bb2abe3bd7a43b7a19e537.tar.gz emacs-45763476fcc967a750bb2abe3bd7a43b7a19e537.zip | |
src/xfaces.c (Fx_load_color_file): Read color file from absolute filename.
Fixes: debbugs:8250
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 75958169951..49b37a843b6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-17 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * xfaces.c (Fx_load_color_file): | ||
| 4 | Read color file from absolute filename (bug#8250). | ||
| 5 | |||
| 1 | 2011-03-11 Juanma Barranquero <lekktu@gmail.com> | 6 | 2011-03-11 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | Backport revno:103582 from trunk. | 8 | Backport revno:103582 from trunk. |
diff --git a/src/xfaces.c b/src/xfaces.c index e9e677d1b19..9956ef55842 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. */) | |||
| 6625 | CHECK_STRING (filename); | 6625 | CHECK_STRING (filename); |
| 6626 | abspath = Fexpand_file_name (filename, Qnil); | 6626 | abspath = Fexpand_file_name (filename, Qnil); |
| 6627 | 6627 | ||
| 6628 | fp = fopen (SDATA (filename), "rt"); | 6628 | fp = fopen (SDATA (abspath), "rt"); |
| 6629 | if (fp) | 6629 | if (fp) |
| 6630 | { | 6630 | { |
| 6631 | char buf[512]; | 6631 | char buf[512]; |