HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Port to GCC 4.9.0 with --enable-gcc-warnings.
[bpt/emacs.git]
/
lisp
/
ps-bdf.el
diff --git
a/lisp/ps-bdf.el
b/lisp/ps-bdf.el
index
2b99a16
..
12e9541
100644
(file)
--- a/
lisp/ps-bdf.el
+++ b/
lisp/ps-bdf.el
@@
-1,13
+1,10
@@
;;; ps-bdf.el --- BDF font file handler for ps-print
;;; ps-bdf.el --- BDF font file handler for ps-print
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2001-2014 Free Software Foundation, Inc.
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009
+;; 2008, 2009
, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
-
;; Copyright (C) 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H13PRO009
;; Copyright (C) 2003
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H13PRO009
@@
-15,6
+12,7
@@
;; Author: Kenichi Handa <handa@m17n.org>
;; (according to ack.texi)
;; Keywords: wp, BDF, font, PostScript
;; Author: Kenichi Handa <handa@m17n.org>
;; (according to ack.texi)
;; Keywords: wp, BDF, font, PostScript
+;; Package: ps-print
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-38,8
+36,7
@@
;;; Code:
;;; Code:
-(eval-and-compile
- (require 'ps-mule))
+(require 'ps-mule)
;;;###autoload
(defcustom bdf-directory-list
;;;###autoload
(defcustom bdf-directory-list
@@
-73,20
+70,15
@@
for BDFNAME."
(defsubst bdf-file-mod-time (filename)
"Return modification time of FILENAME.
(defsubst bdf-file-mod-time (filename)
"Return modification time of FILENAME.
-The value is a list of two integers, the first integer has high-order
-16 bits, the second has low 16 bits."
+The value is a list of integers in the same format as `current-time'."
(nth 5 (file-attributes filename)))
(defun bdf-file-newer-than-time (filename mod-time)
"Return non-nil if and only if FILENAME is newer than MOD-TIME.
(nth 5 (file-attributes filename)))
(defun bdf-file-newer-than-time (filename mod-time)
"Return non-nil if and only if FILENAME is newer than MOD-TIME.
-MOD-TIME is a modification time as a list of two integers, the first
-integer has high-order 16 bits, the second has low 16 bits."
- (let* ((new-mod-time (bdf-file-mod-time filename))
- (new-time (car new-mod-time))
- (time (car mod-time)))
- (or (> new-time time)
- (and (= new-time time)
- (> (nth 1 new-mod-time) (nth 1 mod-time))))))
+MOD-TIME is a modification time as a list of integers in the same
+format as `current-time'."
+ (let ((new-mod-time (bdf-file-mod-time filename)))
+ (time-less-p mod-time new-mod-time)))
(defun bdf-find-file (bdfname)
"Return a buffer visiting a bdf file BDFNAME.
(defun bdf-find-file (bdfname)
"Return a buffer visiting a bdf file BDFNAME.
@@
-99,12
+91,7
@@
If BDFNAME doesn't exist, return nil."
(insert-file-contents bdfname)
buf))))
(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
"Name of cache file which contains information of `BDF' font files.")
(defvar bdf-cache nil
@@
-181,8
+168,8
@@
FONT-INFO is a list of the following format:
(BDFFILE MOD-TIME FONT-BOUNDING-BOX
RELATIVE-COMPOSE BASELINE-OFFSET CODE-RANGE MAXLEN OFFSET-VECTOR)
(BDFFILE MOD-TIME FONT-BOUNDING-BOX
RELATIVE-COMPOSE BASELINE-OFFSET CODE-RANGE MAXLEN OFFSET-VECTOR)
-MOD-TIME is last modification time as a list of
two integers,
the
-
first integer has high-order 16 bits, the second has low 16 bits
.
+MOD-TIME is last modification time as a list of
integers in
the
+
same format as `current-time'
.
SIZE is a size of the font on 72 dpi device. This value is got
from SIZE record of the font.
SIZE is a size of the font on 72 dpi device. This value is got
from SIZE record of the font.
@@
-447,5
+434,4
@@
BITMAP-STRING is a string representing bits by hexadecimal digits."
(provide 'ps-bdf)
(provide 'ps-bdf)
-;; arch-tag: 9b875ba8-565a-4ecf-acaa-30cee732c898
;;; ps-bdf.el ends here
;;; ps-bdf.el ends here