aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Albinus2016-10-20 14:58:13 +0200
committerMichael Albinus2016-10-20 14:58:13 +0200
commitce26926b6223194a6ff0d8a3c17f1d58aaa5d0fe (patch)
tree9db5e547a5c7fa2a2380de19fcd1e73d1c45fa29 /doc
parent38091c90005932017cbac54f2f5b82b3a003b9fa (diff)
parentf63a4b82f0e8634a76e4e7794bb7c7c4e734c4ba (diff)
downloademacs-ce26926b6223194a6ff0d8a3c17f1d58aaa5d0fe.tar.gz
emacs-ce26926b6223194a6ff0d8a3c17f1d58aaa5d0fe.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/files.texi3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 9af5ce967c2..62e0199f1ff 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2855,6 +2855,9 @@ This command deletes the directory named @var{dirname}. The function
2855must use @code{delete-directory} for them. If @var{recursive} is 2855must use @code{delete-directory} for them. If @var{recursive} is
2856@code{nil}, and the directory contains any files, 2856@code{nil}, and the directory contains any files,
2857@code{delete-directory} signals an error. 2857@code{delete-directory} signals an error.
2858If recursive is non-@code{nil}, there is no error merely because the
2859directory or its files are deleted by some other process before
2860@code{delete-directory} gets to them.
2858 2861
2859@code{delete-directory} only follows symbolic links at the level of 2862@code{delete-directory} only follows symbolic links at the level of
2860parent directories. 2863parent directories.