HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(smtpmail-try-auth-methods): If the user has stored a user name, then
[bpt/emacs.git]
/
lisp
/
ps-bdf.el
diff --git
a/lisp/ps-bdf.el
b/lisp/ps-bdf.el
index
c5b394a
..
14aee8c
100644
(file)
--- a/
lisp/ps-bdf.el
+++ b/
lisp/ps-bdf.el
@@
-1,18
+1,18
@@
;;; 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
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2001-2011 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
+;; 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
+;; Author: Kenichi Handa <handa@m17n.org>
+;; (according to ack.texi)
;; Keywords: wp, BDF, font, PostScript
;; Keywords: wp, BDF, font, PostScript
-;;
Maintainer: Kenichi Handa <handa@m17n.org>
+;;
Package: ps-print
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-36,16
+36,18
@@
;;; Code:
;;; Code:
-(eval-and-compile
- (require 'ps-mule))
+(require 'ps-mule)
;;;###autoload
;;;###autoload
-(def
var
bdf-directory-list
+(def
custom
bdf-directory-list
(if (memq system-type '(ms-dos windows-nt))
(list (expand-file-name "fonts/bdf" installation-directory))
'("/usr/local/share/emacs/fonts/bdf"))
(if (memq system-type '(ms-dos windows-nt))
(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\").")
+ "List of directories to search for `BDF' font files.
+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)
;; MS-DOS and MS-Windows users like to move the binary around after
;; it's built, but the value above is computed at load-up time.
;; MS-DOS and MS-Windows users like to move the binary around after
;; it's built, but the value above is computed at load-up time.
@@
-90,8
+92,7
@@
If BDFNAME doesn't exist, return nil."
(and (file-readable-p bdfname)
(let ((buf (generate-new-buffer " *bdf-work*"))
(coding-system-for-read 'no-conversion))
(and (file-readable-p bdfname)
(let ((buf (generate-new-buffer " *bdf-work*"))
(coding-system-for-read 'no-conversion))
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(insert-file-contents bdfname)
buf))))
(insert-file-contents bdfname)
buf))))
@@
-220,8
+221,7
@@
CODE, where N and CODE are in the following relation:
(message "Reading %s..." bdfname)
(error "BDF file %s doesn't exist" bdfname))
(unwind-protect
(message "Reading %s..." bdfname)
(error "BDF file %s doesn't exist" bdfname))
(unwind-protect
- (save-excursion
- (set-buffer buf)
+ (with-current-buffer buf
(goto-char (point-min))
(search-forward "\nFONTBOUNDINGBOX")
(setq font-bounding-box
(goto-char (point-min))
(search-forward "\nFONTBOUNDINGBOX")
(setq font-bounding-box
@@
-444,5
+444,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