diff options
| author | Juanma Barranquero | 2003-02-12 14:14:15 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2003-02-12 14:14:15 +0000 |
| commit | 5b373bd3f77e143c895bae5ee6d0e227cce269df (patch) | |
| tree | d2e081535329628c141ecac1021795d589c7d976 | |
| parent | a01ba4f1b109b74a54de704fd4cf1cfb397dcae0 (diff) | |
| download | emacs-5b373bd3f77e143c895bae5ee6d0e227cce269df.tar.gz emacs-5b373bd3f77e143c895bae5ee6d0e227cce269df.zip | |
(file-truename): Revert change from 2002-11-27.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 773d4a06b3a..2d81a91486a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2003-02-12 Juanma Barranquero <lektu@terra.es> | ||
| 2 | |||
| 3 | * files.el (file-truename): Revert change from 2002-11-27. | ||
| 4 | |||
| 1 | 2003-02-12 Luc Teirlinck <teirllm@mail.auburn.edu> | 5 | 2003-02-12 Luc Teirlinck <teirllm@mail.auburn.edu> |
| 2 | 6 | ||
| 3 | * help-fns.el (describe-function-1): Change output for keyboard | 7 | * help-fns.el (describe-function-1): Change output for keyboard |
diff --git a/lisp/files.el b/lisp/files.el index 5ba163fc671..6d8aee3fe01 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -682,10 +682,8 @@ Do not specify them in other calls." | |||
| 682 | (setq filename (funcall handler 'file-truename filename)) | 682 | (setq filename (funcall handler 'file-truename filename)) |
| 683 | ;; If filename contains a wildcard, newname will be the old name. | 683 | ;; If filename contains a wildcard, newname will be the old name. |
| 684 | (unless (string-match "[[*?]" filename) | 684 | (unless (string-match "[[*?]" filename) |
| 685 | ;; If filename exists, use the long name, otherwise | 685 | ;; If filename exists, use the long name |
| 686 | ;; canonicalize the name, to handle case differences. | 686 | (setq filename (or (w32-long-file-name filename) filename)))) |
| 687 | (setq filename (or (w32-long-file-name filename) | ||
| 688 | (untranslated-canonical-name filename))))) | ||
| 689 | (setq done t))) | 687 | (setq done t))) |
| 690 | 688 | ||
| 691 | ;; If this file directly leads to a link, process that iteratively | 689 | ;; If this file directly leads to a link, process that iteratively |