Wrap around error in coreutil's ls

[gnu-emacs] / lisp / ps-bdf.el

diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 477aee1b2daca5d594e4a01f8bd763f65fb9013d..bde0bb5e01beb4a2056cb0c7ba572f9e1b702471 100644 (file)
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,6 +1,6 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998-1999, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2001-2016 Free Software Foundation, Inc.
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ;;   2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -44,7 +44,7 @@
       (list (expand-file-name "fonts/bdf" installation-directory))
     '("/usr/local/share/emacs/fonts/bdf"))
   "List of directories to search for `BDF' font files.
-The default value is '(\"/usr/local/share/emacs/fonts/bdf\")."
+The default value is (\"/usr/local/share/emacs/fonts/bdf\")."
   :type '(repeat :tag "BDF font directory list"
                 (directory :tag "BDF font directory"))
   :group 'ps-print-miscellany)
@@ -91,12 +91,7 @@ If BDFNAME doesn't exist, return nil."
           (insert-file-contents bdfname)
           buf))))
 
-(defvar bdf-cache-file (if (eq system-type 'ms-dos)
-                          ;; convert-standard-filename doesn't
-                          ;; guarantee that the .el extension will be
-                          ;; preserved.
-                          "~/_bdfcache.el"
-                        (convert-standard-filename "~/.bdfcache.el"))
+(defvar bdf-cache-file (locate-user-emacs-file "bdfcache.el" ".bdfcache.el")
   "Name of cache file which contains information of `BDF' font files.")
 
 (defvar bdf-cache nil