aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2003-04-08 17:11:00 +0000
committerRichard M. Stallman2003-04-08 17:11:00 +0000
commit4773b8ca2017459333c099838aef1635c4e32fa6 (patch)
tree4702a062d87a89f04b644e5f57c3637dc82d712f
parentcf6d23577d6fdfade2979f953745733b70c4a0bd (diff)
downloademacs-4773b8ca2017459333c099838aef1635c4e32fa6.tar.gz
emacs-4773b8ca2017459333c099838aef1635c4e32fa6.zip
(openp): Get the Qfile_exists_p handler for STRING, not FN.
-rw-r--r--src/ChangeLog9
-rw-r--r--src/lread.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4cd53e526cb..9d6afda24d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12003-04-08 Richard M. Stallman <rms@gnu.org>
2
3 * fileio.c (Finsert_file_contents): Doc fix.
4 (syms_of_fileio) <after-insert-file-functions>: Doc fix.
5
62003-04-08 Ivan Zakharyaschev <imz@altlinux.org> (tiny change)
7
8 * lread.c (openp): Get the Qfile_exists_p handler for STRING, not FN.
9
12003-04-08 Steven Tamm <steventamm@mac.com> 102003-04-08 Steven Tamm <steventamm@mac.com>
2 * mac.c (init_mac_osx_environment): Switch libexec and bin so 11 * mac.c (init_mac_osx_environment): Switch libexec and bin so
3 that self-contained application finds libexec files. 12 that self-contained application finds libexec files.
diff --git a/src/lread.c b/src/lread.c
index dfbbfeaad1e..e4663e0eb89 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1121,8 +1121,8 @@ openp (path, str, suffixes, storeptr, predicate)
1121 handler = Ffind_file_name_handler (filename, Qfile_exists_p); 1121 handler = Ffind_file_name_handler (filename, Qfile_exists_p);
1122 It's not clear why that was the case and it breaks things like 1122 It's not clear why that was the case and it breaks things like
1123 (load "/bar.el") where the file is actually "/bar.el.gz". */ 1123 (load "/bar.el") where the file is actually "/bar.el.gz". */
1124 handler = Ffind_file_name_handler (filename, Qfile_exists_p);
1125 string = build_string (fn); 1124 string = build_string (fn);
1125 handler = Ffind_file_name_handler (string, Qfile_exists_p);
1126 if ((!NILP (handler) || !NILP (predicate)) && !NATNUMP (predicate)) 1126 if ((!NILP (handler) || !NILP (predicate)) && !NATNUMP (predicate))
1127 { 1127 {
1128 if (NILP (predicate)) 1128 if (NILP (predicate))