Merge from emacs--rel--22

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

diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 19a776d770667962ff13946a14ec31f9e6cbb2db..35ba405b8f929ce35b71c6e4565d7cfad53993ca 100644 (file)
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,8 +1,9 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ;;   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
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -239,7 +240,7 @@ CODE, where N and CODE are in the following relation:
          (goto-char (point-min))
          (search-forward "\nFONT ")
          (if (looking-at "-[^-]*-[^-]*-[^-]*-[^-]*-[^-]*-[^-]*-\\([0-9]+\\)")
-             (setq size (string-to-int (match-string 1)))
+             (setq size (string-to-number (match-string 1)))
            (search-forward "\nSIZE ")
            (setq size (read (current-buffer)))
            ;; The following kludgy code is t avoid bugs of several