Commit ec70a47d authored by Glenn Morris's avatar Glenn Morris
Browse files

Fix previous change files.el change

parent 25b2e303
......@@ -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,
......
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>
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment