Fix previous change files.el change

diff --git a/etc/NEWS b/etc/NEWS
index 96896ec23437c31979f6fe0b14632634b1f08e37..85f70306a4335c4856c96ab12cf8c06fdd2bad72 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1413,6 +1413,9 @@ Trashing is performed if TRASH and `delete-by-moving-to-trash' are
 both non-nil.  Interactively, TRASH defaults to t, unless a prefix
 argument is supplied (see Trash changes, above).
 
+FIXME
+** New functions files-equal-p, file-subdir-of-p that [do something]
+
 +++
 ** Tool-bars can display separators.
 Tool-bar separators are handled like menu separators in menu-bar maps,

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b019820fe99baac62ee4f358f4c7c44e04c85a5d..68339fc174d06fafaf28bf8569340b30f59daa06 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,14 +1,12 @@
 2012-02-24  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
-       * lisp/files.el (files-equal-p): New, simple equality check between two filename.
-       (file-subdir-of-p): New, Check if dir1 is subdir of dir2.
-       (copy-directory): Return error when trying to copy a directory on itself.
+       * files.el (files-equal-p, file-subdir-of-p): New functions.
+       (copy-directory): Error when trying to copy a directory on itself.
        Add missing copy-contents arg to tramp handler.
-
-       * lisp/dired-aux.el (dired-copy-file-recursive): Same.
-       (dired-create-files): Modify destination when source is equal to dest when copying files.
-       Return also when dest is a subdir of source.
-       (bug#10489)
+       * dired-aux.el (dired-copy-file-recursive): Same.
+       (dired-create-files): Modify destination when source is equal to
+       dest when copying files.
+       Return also when dest is a subdir of source. (bug#10489)
 
 2012-02-24  Michael Albinus  <michael.albinus@gmx.de>
 

diff --git a/lisp/files.el b/lisp/files.el
index 089f248b2ac59d982802171583c5432d880f6b77..3523fbdc01267d3f1851c5f1e95e3dbcca670271 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5002,7 +5002,7 @@ when they don't, it returns nil."
   (let ((handler (or (find-file-name-handler dir1 'file-subdir-of-p)
                      (find-file-name-handler dir2 'file-subdir-of-p))))
     (if handler
-        (funcalll handler 'file-subdir-of-p dir1 dir2)
+        (funcall handler 'file-subdir-of-p dir1 dir2)
       (when (and (file-directory-p dir1)
                  (file-directory-p dir2))
         (loop with f1 = (file-truename dir1)