Skip to content

GitLab

Commit 03e7215a authored by Michael Albinus's avatar Michael Albinus
Browse files

* lisp/files.el (locate-file, files--splice-dirname-file): Fix docstring.

parent bed56428
Pipeline #408 failed with stage
in 22 minutes and 4 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
lisp/files.el
View file @ 03e7215a
...@@ -869,7 +869,7 @@ This function will normally skip directories, so if you want it to find ...@@ -869,7 +869,7 @@ This function will normally skip directories, so if you want it to find
directories, make sure the PREDICATE function returns `dir-ok' for them. directories, make sure the PREDICATE function returns `dir-ok' for them.
PREDICATE can also be an integer to pass to the `access' system call, PREDICATE can also be an integer to pass to the `access' system call,
in which case file-name handlers are ignored. This usage is deprecated. in which case file name handlers are ignored. This usage is deprecated.
For compatibility, PREDICATE can also be one of the symbols For compatibility, PREDICATE can also be one of the symbols
`executable', `readable', `writable', or `exists', or a list of `executable', `readable', `writable', or `exists', or a list of
one or more of those symbols." one or more of those symbols."
...@@ -1202,10 +1202,11 @@ names beginning with `~'." ...@@ -1202,10 +1202,11 @@ names beginning with `~'."
"Splice DIRNAME to FILE like the operating system would. "Splice DIRNAME to FILE like the operating system would.
If FILE is relative, return DIRNAME concatenated to FILE. If FILE is relative, return DIRNAME concatenated to FILE.
Otherwise return FILE, quoted as needed if DIRNAME and FILE have Otherwise return FILE, quoted as needed if DIRNAME and FILE have
different handlers; although this quoting is dubious if DIRNAME different file name handlers; although this quoting is dubious if
is magic, it is not clear what would be better. This function DIRNAME is magic, it is not clear what would be better. This
differs from `expand-file-name' in that DIRNAME must be a function differs from `expand-file-name' in that DIRNAME must be
directory name and leading `~' and `/:' are not special in FILE." a directory name and leading `~' and `/:' are not special in
FILE."
(let ((unquoted (if (files--name-absolute-system-p file) (let ((unquoted (if (files--name-absolute-system-p file)
file file
(concat dirname file)))) (concat dirname file))))
...@@ -6747,7 +6748,7 @@ Valid wildcards are '*', '?', '[abc]' and '[a-z]'." ...@@ -6747,7 +6748,7 @@ Valid wildcards are '*', '?', '[abc]' and '[a-z]'."
;; dired-after-subdir-garbage (defines what a "total" line is) ;; dired-after-subdir-garbage (defines what a "total" line is)
;; - variable dired-subdir-regexp ;; - variable dired-subdir-regexp
;; - may be passed "--dired" as the first argument in SWITCHES. ;; - may be passed "--dired" as the first argument in SWITCHES.
;; Filename handlers might have to remove this switch if their ;; File name handlers might have to remove this switch if their
;; "ls" command does not support it. ;; "ls" command does not support it.
(defun insert-directory (file switches &optional wildcard full-directory-p) (defun insert-directory (file switches &optional wildcard full-directory-p)
"Insert directory listing for FILE, formatted according to SWITCHES. "Insert directory listing for FILE, formatted according to SWITCHES.
......
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