diff options
| author | Eli Zaretskii | 2016-09-07 19:21:08 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2016-09-07 19:21:08 +0300 |
| commit | ec12c6705f91106c4f4c53e76447dafa21e12f9f (patch) | |
| tree | 7cb9bc547541efe0c8ccafa9aa7a6f600f8194c8 | |
| parent | 5d2ac7435de679559aae0ede1d8b6f1750c09e68 (diff) | |
| download | emacs-ec12c6705f91106c4f4c53e76447dafa21e12f9f.tar.gz emacs-ec12c6705f91106c4f4c53e76447dafa21e12f9f.zip | |
Fix documentation of convert-standard-filename on MS-Windows
* lisp/files.el (convert-standard-filename): Doc fix. (Bug#24387)
* etc/NEWS: Suggest a way for mirroring slashes where previously
'convert-standard-filename' was used.
| -rw-r--r-- | etc/NEWS | 11 | ||||
| -rw-r--r-- | lisp/files.el | 4 |
2 files changed, 11 insertions, 4 deletions
| @@ -605,7 +605,16 @@ still apply.) | |||
| 605 | 605 | ||
| 606 | ** 'convert-standard-filename' no longer mirrors slashes on MS-Windows. | 606 | ** 'convert-standard-filename' no longer mirrors slashes on MS-Windows. |
| 607 | Previously, on MS-Windows this function converted slash characters in | 607 | Previously, on MS-Windows this function converted slash characters in |
| 608 | file names into backslashes. It no longer does that. | 608 | file names into backslashes. It no longer does that. If your Lisp |
| 609 | program used 'convert-standard-filename' to prepare file names to be | ||
| 610 | passed to subprocesses (which is not the recommended usage of that | ||
| 611 | function), you will now have to mirror slashes in your application | ||
| 612 | code. One possible way is this: | ||
| 613 | |||
| 614 | (let ((start 0)) | ||
| 615 | (while (string-match "/" file-name start) | ||
| 616 | (aset file-name (match-beginning 0) ?\\) | ||
| 617 | (setq start (match-end 0)))) | ||
| 609 | 618 | ||
| 610 | ** GUI sessions now treat SIGINT like Posix platforms do. | 619 | ** GUI sessions now treat SIGINT like Posix platforms do. |
| 611 | The effect of delivering a Ctrl-C (SIGINT) signal to a GUI Emacs on | 620 | The effect of delivering a Ctrl-C (SIGINT) signal to a GUI Emacs on |
diff --git a/lisp/files.el b/lisp/files.el index ff39008cdbf..4bd708deed8 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -609,9 +609,7 @@ is a valid DOS file name, but c:/bar/c:/foo is not. | |||
| 609 | This function's standard definition is trivial; it just returns | 609 | This function's standard definition is trivial; it just returns |
| 610 | the argument. However, on Windows and DOS, replace invalid | 610 | the argument. However, on Windows and DOS, replace invalid |
| 611 | characters. On DOS, make sure to obey the 8.3 limitations. | 611 | characters. On DOS, make sure to obey the 8.3 limitations. |
| 612 | In the native Windows build, turn Cygwin names into native names, | 612 | In the native Windows build, turn Cygwin names into native names. |
| 613 | and also turn slashes into backslashes if the shell requires it (see | ||
| 614 | `w32-shell-dos-semantics'). | ||
| 615 | 613 | ||
| 616 | See Info node `(elisp)Standard File Names' for more details." | 614 | See Info node `(elisp)Standard File Names' for more details." |
| 617 | (cond | 615 | (cond |