[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 401394d 03/18: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 401394d 03/18: Merge from origin/emacs-25 |
Date: |
Wed, 7 Dec 2016 20:54:04 +0000 (UTC) |
branch: master
commit 401394d20b0ee431e52af84b1ca54c91d2926fd9
Merge: 9b9ab8f 7287e96
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
7287e96 ; * src/lread.c (openp): Correct an inaccuracy in commentary.
---
src/lread.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lread.c b/src/lread.c
index 14f9393..1335ccf 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1411,7 +1411,7 @@ directories, make sure the PREDICATE function returns
`dir-ok' for them. */)
PREDICATE t means the files are binary.
PREDICATE non-nil and non-t means don't open the files,
just look for one that satisfies the predicate. In this case,
- return 1 on success. The predicate can be a lisp function or
+ return -2 on success. The predicate can be a lisp function or
an integer to pass to `access' (in which case file-name-handlers
are ignored).
- [Emacs-diffs] master updated (4ab7c30 -> aed629d), Paul Eggert, 2016/12/07
- [Emacs-diffs] master 9b9ab8f 02/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master fa8dbb6 04/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 401394d 03/18: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master 33a2f93 14/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 8cd0d5d 10/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master e22eabd 12/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 8209e03 06/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 99e20f1 13/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 32b46fc 08/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 3ace6b1 05/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master fd6632b 07/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master fe6131b 16/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master c5532f5 09/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07