[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 03e7215: * lisp/files.el (locate-file, files--splic
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 03e7215: * lisp/files.el (locate-file, files--splice-dirname-file): Fix docstring. |
Date: |
Mon, 31 Dec 2018 05:39:06 -0500 (EST) |
branch: master
commit 03e7215a0b89c2a02c50de77fd79817bf888b931
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
* lisp/files.el (locate-file, files--splice-dirname-file): Fix docstring.
---
lisp/files.el | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index 0dd597e..6cf484b 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
directories, make sure the PREDICATE function returns `dir-ok' for them.
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
`executable', `readable', `writable', or `exists', or a list of
one or more of those symbols."
@@ -1202,10 +1202,11 @@ names beginning with `~'."
"Splice DIRNAME to FILE like the operating system would.
If FILE is relative, return DIRNAME concatenated to FILE.
Otherwise return FILE, quoted as needed if DIRNAME and FILE have
-different handlers; although this quoting is dubious if DIRNAME
-is magic, it is not clear what would be better. This function
-differs from `expand-file-name' in that DIRNAME must be a
-directory name and leading `~' and `/:' are not special in FILE."
+different file name handlers; although this quoting is dubious if
+DIRNAME is magic, it is not clear what would be better. This
+function differs from `expand-file-name' in that DIRNAME must be
+a directory name and leading `~' and `/:' are not special in
+FILE."
(let ((unquoted (if (files--name-absolute-system-p file)
file
(concat dirname file))))
@@ -6747,7 +6748,7 @@ Valid wildcards are '*', '?', '[abc]' and '[a-z]'."
;; dired-after-subdir-garbage (defines what a "total" line is)
;; - variable dired-subdir-regexp
;; - 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.
(defun insert-directory (file switches &optional wildcard full-directory-p)
"Insert directory listing for FILE, formatted according to SWITCHES.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 03e7215: * lisp/files.el (locate-file, files--splice-dirname-file): Fix docstring.,
Michael Albinus <=