Commit 51f32106 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(dos-8+3-filename): Rename from dos-truncate-to-8+3.

All callers changed.
parent b138056a
2001-04-07 Eli Zaretskii <eliz@is.elta.co.il>
* dos-fns.el (dos-8+3-filename): Rename from dos-truncate-to-8+3.
All callers changed.
2001-04-06 Eli Zaretskii <eliz@is.elta.co.il>
 
* international/titdic-cnv.el (miscdic-convert): For MS-DOS, if
......
......@@ -114,7 +114,7 @@ with a definition that really does change some file names."
(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 @@ with a definition that really does change some file names."
(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 @@ with a definition that really does change some file names."
(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.
......
......@@ -983,7 +983,7 @@ the generated Quail package is saved."
;; 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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment