diff options
| author | Eli Zaretskii | 2022-08-30 19:09:00 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2022-08-30 19:09:00 +0300 |
| commit | bbc23ca8ab42d7a45bcbadd5ffd911868eb6f99d (patch) | |
| tree | b93c8d3e88fb6d31c59d48a1b02237e9d2f61943 | |
| parent | 0cbcaf5119d36093882f0c414c4c586186ef77b2 (diff) | |
| download | emacs-bbc23ca8ab42d7a45bcbadd5ffd911868eb6f99d.tar.gz emacs-bbc23ca8ab42d7a45bcbadd5ffd911868eb6f99d.zip | |
One more fix for find-file.el
* lisp/find-file.el (ff-get-file-name): Use 'expand-file-name'
instead of 'concat', which doesn't DTRT with absolute file names.
(ff-other-file-alist): Yet another doc fix. (Bug#57325)
| -rw-r--r-- | lisp/find-file.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/find-file.el b/lisp/find-file.el index aaabec11e83..646779fc919 100644 --- a/lisp/find-file.el +++ b/lisp/find-file.el | |||
| @@ -216,9 +216,9 @@ matching extension or name (e.g., `.cc' yields `.hh'). | |||
| 216 | This alist should be set by the major mode. | 216 | This alist should be set by the major mode. |
| 217 | 217 | ||
| 218 | Note: if an element of the alist names a FUNCTION as its cdr, that | 218 | Note: if an element of the alist names a FUNCTION as its cdr, that |
| 219 | function must return a non-nil list of file-name extensions. It cannot | 219 | function must return a non-nil list of file-names. It cannot |
| 220 | return nil, nor can it signal in any way a failure to find a suitable | 220 | return nil, nor can it signal in any way a failure to find a suitable |
| 221 | list of extensions." | 221 | list of file names." |
| 222 | :type '(choice (repeat (list regexp (choice (repeat string) function))) | 222 | :type '(choice (repeat (list regexp (choice (repeat string) function))) |
| 223 | symbol)) | 223 | symbol)) |
| 224 | 224 | ||
| @@ -629,7 +629,7 @@ name of the first file found." | |||
| 629 | (while (and suffixes (not found)) | 629 | (while (and suffixes (not found)) |
| 630 | 630 | ||
| 631 | (setq filename (concat fname-stub this-suffix)) | 631 | (setq filename (concat fname-stub this-suffix)) |
| 632 | (setq file (concat dir "/" filename)) | 632 | (setq file (expand-file-name filename dir)) |
| 633 | 633 | ||
| 634 | (if (not ff-quiet-mode) | 634 | (if (not ff-quiet-mode) |
| 635 | (message "Finding %s..." file)) | 635 | (message "Finding %s..." file)) |