aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-09-16 18:03:28 +0000
committerEli Zaretskii2001-09-16 18:03:28 +0000
commita5f01960473be2b86d3cb4b238aca7a94155f0d3 (patch)
tree673f336366f95998ed044192eec620752851ee5e
parenta007e4e39dbb01153acbaa837b050afab420f2f8 (diff)
downloademacs-a5f01960473be2b86d3cb4b238aca7a94155f0d3.tar.gz
emacs-a5f01960473be2b86d3cb4b238aca7a94155f0d3.zip
(bdf-cache-file) <ms-dos>: Use _bdfcache.el, since
convert-standard-filename doesn't guarantee that the .el extension is preserved.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ps-bdf.el7
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d618fe0c5b..a7bf2228b8b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12001-09-16 Eli Zaretskii <eliz@is.elta.co.il> 12001-09-16 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * ps-bdf.el (bdf-cache-file) <ms-dos>: Use _bdfcache.el, since
4 convert-standard-filename doesn't guarantee that the .el extension
5 is preserved.
6
3 * dos-fns.el (convert-standard-filename): Replace invalid 7 * dos-fns.el (convert-standard-filename): Replace invalid
4 characters only after converting dash/underscore to a period. 8 characters only after converting dash/underscore to a period.
5 (original-make-auto-save-file-name): New. 9 (original-make-auto-save-file-name): New.
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 66c3faf3cb1..34c65d55aa4 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -104,7 +104,12 @@ If BDFNAME doesn't exist, return nil."
104 (insert-file-contents file-name) 104 (insert-file-contents file-name)
105 buf))))) 105 buf)))))
106 106
107(defvar bdf-cache-file (convert-standard-filename "~/.bdfcache.el") 107(defvar bdf-cache-file (if (eq system-type 'ms-dos)
108 ;; convert-standard-filename doesn't
109 ;; guarantee that the .el extension will be
110 ;; preserved.
111 "~/_bdfcache.el"
112 (convert-standard-filename "~/.bdfcache.el"))
108 "Name of cache file which contains information of `BDF' font files.") 113 "Name of cache file which contains information of `BDF' font files.")
109 114
110(defvar bdf-cache nil 115(defvar bdf-cache nil