diff options
| author | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
| commit | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (patch) | |
| tree | 1795142ec7861fc85c61adc90f03265b69041556 /src/charset.c | |
| parent | 3c4ca7155293ffc2d04708007131bcbc882d8913 (diff) | |
| parent | 6ad30855c02908fdd99d9b11943719e185e65ee3 (diff) | |
| download | emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.tar.gz emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.zip | |
Merge from trunk.
Diffstat (limited to 'src/charset.c')
| -rw-r--r-- | src/charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c index 6b999824dab..c9133c780e8 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -2293,7 +2293,7 @@ init_charset (void) | |||
| 2293 | { | 2293 | { |
| 2294 | Lisp_Object tempdir; | 2294 | Lisp_Object tempdir; |
| 2295 | tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); | 2295 | tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); |
| 2296 | if (access (SSDATA (tempdir), 0) < 0) | 2296 | if (! file_accessible_directory_p (SSDATA (tempdir))) |
| 2297 | { | 2297 | { |
| 2298 | /* This used to be non-fatal (dir_warning), but it should not | 2298 | /* This used to be non-fatal (dir_warning), but it should not |
| 2299 | happen, and if it does sooner or later it will cause some | 2299 | happen, and if it does sooner or later it will cause some |