diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-12-30 17:02:40 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-12-30 17:02:40 -0800 |
| commit | 433b6a74ec73608ff06106daee4f53c5175d5297 (patch) | |
| tree | 1be58fb0808c683eb4b488a95555e2e24206ea61 /lisp/files.el | |
| parent | f23b1db37a816ab88a5970e67d1aaeb7f68ca47c (diff) | |
| parent | 82c82b1c773f441fe424b7ed1757c8eda31814c0 (diff) | |
| download | emacs-433b6a74ec73608ff06106daee4f53c5175d5297.tar.gz emacs-433b6a74ec73608ff06106daee4f53c5175d5297.tar.bz2 emacs-433b6a74ec73608ff06106daee4f53c5175d5297.zip | |
Merge from origin/emacs-26
82c82b1 (origin/emacs-26) In user manual fix value of default frame h...
2e8825d Improve documentation of 'file-local-name' and related APIs
11f0635 ; Remove comment in esh-proc.el
# Conflicts:
# lisp/simple.el
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el index fb09c96c47e..0dd597efe11 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1173,7 +1173,10 @@ consecutive checks. For example: (defun file-local-name (file) "Return the local name component of FILE. -It returns a file name which can be used directly as argument of +This function removes from FILE the specification of the remote host +and the method of accessing the host, leaving only the part that +identifies FILE locally on the remote system. +The returned file name can be used directly as argument of `process-file', `start-file-process', or `shell-command'." (or (file-remote-p file 'localname) file)) |