From ec70a47da987003b5a434a396401f54713141725 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 24 Feb 2012 14:25:38 -0500 Subject: [PATCH] Fix previous change files.el change --- etc/NEWS | 3 +++ lisp/ChangeLog | 14 ++++++-------- lisp/files.el | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 96896ec234..85f70306a4 100644 --- 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 b019820fe9..68339fc174 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,14 +1,12 @@ 2012-02-24 Thierry Volpiatto - * 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 diff --git a/lisp/files.el b/lisp/files.el index 089f248b2a..3523fbdc01 100644 --- 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) -- 2.39.2