Code and doc fixes for file-subdir-of-p and files-equal-p.

* lisp/files.el (files-equal-p): Doc fix.
(file-subdir-of-p): Doc fix.  Convert loop macro to plain Lisp,
and quit the loop once a mismatch is found.

* doc/lispref/files.texi (Kinds of Files): Improve documentation of
files-equal-p and file-subdir-of-p.

3 files changed, 16 insertions, 12 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a339205a7fe..6d9cd6b4f8a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-26  Chong Yidong  <cyd@gnu.org>
+
+        * files.texi (Kinds of Files): Improve documentation of
+        files-equal-p and file-subdir-of-p.
+
 2012-02-26  Glenn Morris  <rgm@gnu.org>
 
         * intro.texi (Acknowledgements): Small changes.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 1fee572a573..277a4cabdf1 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1019,20 +1019,19 @@ other I/O device).
 @end defun
 
 @defun files-equal-p file1 file2
-This function return @code{t} if the files @var{file1} and @var{file2} name
-the same file.
-Comparison is made with the @code{file-attributes} of both files. 
+This function returns @code{t} if the files @var{file1} and
+@var{file2} name the same file.  Two ordinary files are considered to
+be the same if the function @code{file-attributes} (@xref{File
+Attributes}) returns @code{equal} values for them.
 @end defun
 
 @defun file-subdir-of-p dir1 dir2
-This function return @code{t} if directory @var{dir1} is a subdirectory
-of @var{dir2} or if @var{dir1} and @var{dir2} are the same directory.
-Arguments @var{dir1} and @var{dir2} must be existing directories,
-otherwise, return nil.
-Check is done by building a directory name based on equality of differents
-components of both directory names, if this resulting directory name
-is equal to @var{dir2}, we assume directory @var{dir1}
-is a subdirectory of @var{dir2}.
+This function returns @code{t} if directory @var{dir1} is a
+subdirectory of @var{dir2}, or if @var{dir1} and @var{dir2} are the
+same directory.  It compares the @code{file-truename} values of the
+two directories (@pxref{Truenames}).  If either @var{dir1} or
+@var{dir2} do not name existing directories, the return value is
+@code{nil}.
 @end defun
 
 @node Truenames
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index a4ee6f8327f..eac895b6279 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1596,7 +1596,7 @@ where @var{get} is an expression that returns the current state,
 and @var{set} is a function of one argument (a state) that sets it.
 
 @item :after-hook @var{after-hook}
-This defines a single lisp form which is evaluated after the mode hooks
+This defines a single Lisp form which is evaluated after the mode hooks
 have run.  It should not be quoted.
 @end table