[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107407: Fix previous change files.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107407: Fix previous change files.el change |
Date: |
Fri, 24 Feb 2012 14:25:38 -0500 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107407
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-02-24 14:25:38 -0500
message:
Fix previous change files.el change
modified:
etc/NEWS
lisp/ChangeLog
lisp/files.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2012-02-23 19:47:27 +0000
+++ b/etc/NEWS 2012-02-24 19:25:38 +0000
@@ -1413,6 +1413,9 @@
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,
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-02-24 18:04:03 +0000
+++ b/lisp/ChangeLog 2012-02-24 19:25:38 +0000
@@ -1,14 +1,12 @@
2012-02-24 Thierry Volpiatto <address@hidden>
- * 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 <address@hidden>
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2012-02-24 18:04:03 +0000
+++ b/lisp/files.el 2012-02-24 19:25:38 +0000
@@ -5002,7 +5002,7 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107407: Fix previous change files.el change,
Glenn Morris <=