Mercurial > emacs
changeset 37262:3e478bb3f389
(dos-8+3-filename): Rename from dos-truncate-to-8+3.
All callers changed.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 07 Apr 2001 07:53:23 +0000 |
| parents | 4ffaf150ddfc |
| children | 1021be45c6e7 |
| files | lisp/dos-fns.el lisp/international/titdic-cnv.el |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/dos-fns.el Fri Apr 06 19:34:29 2001 +0000 +++ b/lisp/dos-fns.el Sat Apr 07 07:53:23 2001 +0000 @@ -114,7 +114,7 @@ (convert-standard-filename dir)) string)))))) -(defun dos-truncate-to-8+3 (filename) +(defun dos-8+3-filename (filename) "Truncate FILENAME to DOS 8+3 limits." (if (or (not (stringp filename)) (< (length filename) 5)) ; too short to give any trouble @@ -122,7 +122,7 @@ (let ((flen (length filename))) ;; If FILENAME has a trailing slash, remove it and recurse. (if (memq (aref filename (1- flen)) '(?/ ?\\)) - (concat (dos-truncate-to-8+3 (substring filename 0 (1- flen))) + (concat (dos-8+3-filename (substring filename 0 (1- flen))) "/") (let* (;; ange-ftp gets in the way for names like "/foo:bar". ;; We need to inhibit all magic file names, because @@ -166,10 +166,10 @@ (aset string (1- (length string)) lastchar)) (concat (if (and (stringp dir) (memq (aref dir dlen-m-1) '(?/ ?\\))) - (concat (dos-truncate-to-8+3 (substring dir 0 dlen-m-1)) + (concat (dos-8+3-filename (substring dir 0 dlen-m-1)) "/") ;; Recurse to truncate the leading directories. - (dos-truncate-to-8+3 dir)) + (dos-8+3-filename dir)) string)))))) ;; See dos-vars.el for defcustom.
--- a/lisp/international/titdic-cnv.el Fri Apr 06 19:34:29 2001 +0000 +++ b/lisp/international/titdic-cnv.el Sat Apr 07 07:53:23 2001 +0000 @@ -983,7 +983,7 @@ ;; Give DOS users a chance... (and (fboundp 'msdos-long-file-names) (not (msdos-long-file-names)) - (string-match (dos-truncate-to-8+3 (nth 2 (car tail))) + (string-match (dos-8+3-filename (nth 2 (car tail))) filename))) (setq slot (car tail) name (car slot)