From 915b0bf0ab6ed6d9ae587954cd144290ece4c089 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sun, 30 May 2004 21:21:42 +0000 Subject: [PATCH] Rework docstring (wording by Eli Zaretskii and Kai Grossjohann). --- lisp/dos-fns.el | 10 +++++++--- lisp/files.el | 13 +++++++++---- lisp/w32-fns.el | 10 +++++++--- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index 65b6c0063c0..1253b7b5811 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -31,9 +31,13 @@ ;; This overrides a trivial definition in files.el. (defun convert-standard-filename (filename) "Convert a standard file's name to something suitable for the current OS. -This function's standard definition is trivial; it just returns the argument. -However, on some systems, the function is redefined -with a definition that really does change some file names." +This means to guarantee valid names and perhaps to canonicalize +certain patterns. + +On Windows and DOS, replace invalid characters. On DOS, make +sure to obey the 8.3 limitations. On Windows, turn Cygwin names +into native names, and also turn slashes into backslashes if the +shell requires it (see `w32-shell-dos-semantics')." (if (or (not (stringp filename)) ;; This catches the case where FILENAME is "x:" or "x:/" or ;; "/", thus preventing infinite recursion. diff --git a/lisp/files.el b/lisp/files.el index 47f4c070cba..81e014d2283 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -481,10 +481,15 @@ Runs the usual ange-ftp hook, but only for completion operations." (defun convert-standard-filename (filename) "Convert a standard file's name to something suitable for the current OS. -This function's standard definition is trivial; it just returns the argument. -However, on some systems, the function is redefined with a definition -that really does change some file names to canonicalize certain -patterns and to guarantee valid names." +This means to guarantee valid names and perhaps to canonicalize +certain patterns. + +This function's standard definition is trivial; it just returns +the argument. However, on Windows and DOS, replace invalid +characters. On DOS, make sure to obey the 8.3 limitations. On +Windows, turn Cygwin names into native names, and also turn +slashes into backslashes if the shell requires it (see +`w32-shell-dos-semantics')." filename) (defun read-directory-name (prompt &optional dir default-dirname mustmatch initial) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 4a485414d7a..86703a3b9b5 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -230,9 +230,13 @@ You should set this to t when using a non-system shell.\n\n")))) (defun convert-standard-filename (filename) "Convert a standard file's name to something suitable for the current OS. -This function's standard definition is trivial; it just returns the argument. -However, on some systems, the function is redefined -with a definition that really does change some file names." +This means to guarantee valid names and perhaps to canonicalize +certain patterns. + +On Windows and DOS, replace invalid characters. On DOS, make +sure to obey the 8.3 limitations. On Windows, turn Cygwin names +into native names, and also turn slashes into backslashes if the +shell requires it (see `w32-shell-dos-semantics')." (let ((name (save-match-data (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename) -- 2.39.5