aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-12-31 11:38:56 +0100
committerMichael Albinus2018-12-31 11:38:56 +0100
commit03e7215a0b89c2a02c50de77fd79817bf888b931 (patch)
tree9615b34f22accfc65885fbbacf0badccb4be103b
parentbed56428a6e767d68a974f5ad81bebf035eb44f4 (diff)
downloademacs-03e7215a0b89c2a02c50de77fd79817bf888b931.tar.gz
emacs-03e7215a0b89c2a02c50de77fd79817bf888b931.zip
* lisp/files.el (locate-file, files--splice-dirname-file): Fix docstring.
-rw-r--r--lisp/files.el13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 0dd597efe11..6cf484b4f9c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -869,7 +869,7 @@ This function will normally skip directories, so if you want it to find
869directories, make sure the PREDICATE function returns `dir-ok' for them. 869directories, make sure the PREDICATE function returns `dir-ok' for them.
870 870
871PREDICATE can also be an integer to pass to the `access' system call, 871PREDICATE can also be an integer to pass to the `access' system call,
872in which case file-name handlers are ignored. This usage is deprecated. 872in which case file name handlers are ignored. This usage is deprecated.
873For compatibility, PREDICATE can also be one of the symbols 873For compatibility, PREDICATE can also be one of the symbols
874`executable', `readable', `writable', or `exists', or a list of 874`executable', `readable', `writable', or `exists', or a list of
875one or more of those symbols." 875one or more of those symbols."
@@ -1202,10 +1202,11 @@ names beginning with `~'."
1202 "Splice DIRNAME to FILE like the operating system would. 1202 "Splice DIRNAME to FILE like the operating system would.
1203If FILE is relative, return DIRNAME concatenated to FILE. 1203If FILE is relative, return DIRNAME concatenated to FILE.
1204Otherwise return FILE, quoted as needed if DIRNAME and FILE have 1204Otherwise return FILE, quoted as needed if DIRNAME and FILE have
1205different handlers; although this quoting is dubious if DIRNAME 1205different file name handlers; although this quoting is dubious if
1206is magic, it is not clear what would be better. This function 1206DIRNAME is magic, it is not clear what would be better. This
1207differs from `expand-file-name' in that DIRNAME must be a 1207function differs from `expand-file-name' in that DIRNAME must be
1208directory name and leading `~' and `/:' are not special in FILE." 1208a directory name and leading `~' and `/:' are not special in
1209FILE."
1209 (let ((unquoted (if (files--name-absolute-system-p file) 1210 (let ((unquoted (if (files--name-absolute-system-p file)
1210 file 1211 file
1211 (concat dirname file)))) 1212 (concat dirname file))))
@@ -6747,7 +6748,7 @@ Valid wildcards are '*', '?', '[abc]' and '[a-z]'."
6747;; dired-after-subdir-garbage (defines what a "total" line is) 6748;; dired-after-subdir-garbage (defines what a "total" line is)
6748;; - variable dired-subdir-regexp 6749;; - variable dired-subdir-regexp
6749;; - may be passed "--dired" as the first argument in SWITCHES. 6750;; - may be passed "--dired" as the first argument in SWITCHES.
6750;; Filename handlers might have to remove this switch if their 6751;; File name handlers might have to remove this switch if their
6751;; "ls" command does not support it. 6752;; "ls" command does not support it.
6752(defun insert-directory (file switches &optional wildcard full-directory-p) 6753(defun insert-directory (file switches &optional wildcard full-directory-p)
6753 "Insert directory listing for FILE, formatted according to SWITCHES. 6754 "Insert directory listing for FILE, formatted according to SWITCHES.