aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWolfgang Jenkner2011-02-22 13:02:11 -0500
committerStefan Monnier2011-02-22 13:02:11 -0500
commitaa0f73d190917d9669465c7a57a4d127fd7b2513 (patch)
tree0840fe2f574aae8b61b95065563f72c5d9b6592c /src
parentb97decf246d6c67b3bc74732fbe9b366ed865a50 (diff)
downloademacs-aa0f73d190917d9669465c7a57a4d127fd7b2513.tar.gz
emacs-aa0f73d190917d9669465c7a57a4d127fd7b2513.zip
* src/lread.c (openp): Correct Boolean typo in last commit.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/lread.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4823d873847..097742c7103 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,11 @@
12011-02-22 Wolfgang Jenkner <wjenkner@inode.at> (tiny change)
2
3 * lread.c (openp): Correct Boolean typo in last commit.
4
12011-02-22 Adrian Robert <Adrian.B.Robert@gmail.com> 52011-02-22 Adrian Robert <Adrian.B.Robert@gmail.com>
2 6
3 * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified 7 * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified
4 key to emacs, treat as unmodified (go to input manager 8 key to Emacs, treat as unmodified (go to input manager processing).
5 processing).
6 9
72011-02-22 Paul Eggert <eggert@cs.ucla.edu> 102011-02-22 Paul Eggert <eggert@cs.ucla.edu>
8 11
diff --git a/src/lread.c b/src/lread.c
index e594a363873..8a5f6ecd691 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1384,7 +1384,7 @@ openp (Lisp_Object path, Lisp_Object str, Lisp_Object suffixes, Lisp_Object *sto
1384 Lisp_Object tmp = call1 (predicate, string); 1384 Lisp_Object tmp = call1 (predicate, string);
1385 exists = !NILP (tmp) 1385 exists = !NILP (tmp)
1386 && (EQ (tmp, Qdir_ok) 1386 && (EQ (tmp, Qdir_ok)
1387 || !NILP (Ffile_directory_p (string))); 1387 || NILP (Ffile_directory_p (string)));
1388 } 1388 }
1389 1389
1390 if (exists) 1390 if (exists)