aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-04-07 07:55:22 +0000
committerEli Zaretskii2001-04-07 07:55:22 +0000
commit51f32106f2de16e15de19e15ae714ff7f3e82b22 (patch)
tree65dbbbb4b867e4c55de2c1282024d9830b7ebebc
parentb138056a79c068c31ea91885b44faea56e21c93b (diff)
downloademacs-51f32106f2de16e15de19e15ae714ff7f3e82b22.tar.gz
emacs-51f32106f2de16e15de19e15ae714ff7f3e82b22.zip
(dos-8+3-filename): Rename from dos-truncate-to-8+3.
All callers changed.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dos-fns.el8
-rw-r--r--lisp/international/titdic-cnv.el2
3 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 042fb429242..87371e343e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-04-07 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * dos-fns.el (dos-8+3-filename): Rename from dos-truncate-to-8+3.
4 All callers changed.
5
12001-04-06 Eli Zaretskii <eliz@is.elta.co.il> 62001-04-06 Eli Zaretskii <eliz@is.elta.co.il>
2 7
3 * international/titdic-cnv.el (miscdic-convert): For MS-DOS, if 8 * international/titdic-cnv.el (miscdic-convert): For MS-DOS, if
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 5280280be2b..09267c28c18 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -114,7 +114,7 @@ with a definition that really does change some file names."
114 (convert-standard-filename dir)) 114 (convert-standard-filename dir))
115 string)))))) 115 string))))))
116 116
117(defun dos-truncate-to-8+3 (filename) 117(defun dos-8+3-filename (filename)
118 "Truncate FILENAME to DOS 8+3 limits." 118 "Truncate FILENAME to DOS 8+3 limits."
119 (if (or (not (stringp filename)) 119 (if (or (not (stringp filename))
120 (< (length filename) 5)) ; too short to give any trouble 120 (< (length filename) 5)) ; too short to give any trouble
@@ -122,7 +122,7 @@ with a definition that really does change some file names."
122 (let ((flen (length filename))) 122 (let ((flen (length filename)))
123 ;; If FILENAME has a trailing slash, remove it and recurse. 123 ;; If FILENAME has a trailing slash, remove it and recurse.
124 (if (memq (aref filename (1- flen)) '(?/ ?\\)) 124 (if (memq (aref filename (1- flen)) '(?/ ?\\))
125 (concat (dos-truncate-to-8+3 (substring filename 0 (1- flen))) 125 (concat (dos-8+3-filename (substring filename 0 (1- flen)))
126 "/") 126 "/")
127 (let* (;; ange-ftp gets in the way for names like "/foo:bar". 127 (let* (;; ange-ftp gets in the way for names like "/foo:bar".
128 ;; We need to inhibit all magic file names, because 128 ;; We need to inhibit all magic file names, because
@@ -166,10 +166,10 @@ with a definition that really does change some file names."
166 (aset string (1- (length string)) lastchar)) 166 (aset string (1- (length string)) lastchar))
167 (concat (if (and (stringp dir) 167 (concat (if (and (stringp dir)
168 (memq (aref dir dlen-m-1) '(?/ ?\\))) 168 (memq (aref dir dlen-m-1) '(?/ ?\\)))
169 (concat (dos-truncate-to-8+3 (substring dir 0 dlen-m-1)) 169 (concat (dos-8+3-filename (substring dir 0 dlen-m-1))
170 "/") 170 "/")
171 ;; Recurse to truncate the leading directories. 171 ;; Recurse to truncate the leading directories.
172 (dos-truncate-to-8+3 dir)) 172 (dos-8+3-filename dir))
173 string)))))) 173 string))))))
174 174
175;; See dos-vars.el for defcustom. 175;; See dos-vars.el for defcustom.
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index a4d52f5a53c..004dc7b8b83 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -983,7 +983,7 @@ the generated Quail package is saved."
983 ;; Give DOS users a chance... 983 ;; Give DOS users a chance...
984 (and (fboundp 'msdos-long-file-names) 984 (and (fboundp 'msdos-long-file-names)
985 (not (msdos-long-file-names)) 985 (not (msdos-long-file-names))
986 (string-match (dos-truncate-to-8+3 (nth 2 (car tail))) 986 (string-match (dos-8+3-filename (nth 2 (car tail)))
987 filename))) 987 filename)))
988 (setq slot (car tail) 988 (setq slot (car tail)
989 name (car slot) 989 name (car slot)