(bdf-read-font-info): Ignore glyphs whose ENCODING is

negative.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb7ae71c671399a47cb1c40e44c31e165e23d5a3..9e7f79c296523f44ab759be5a224dd690726e1eb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-27  Kenichi Handa  <handa@m17n.org>
+
+       * ps-bdf.el (bdf-read-font-info): Ignore glyphs whose ENCODING is
+       negative.
+
+       * ps-mule.el (ps-mule-bitmap-prologue): Fix arguments to
+       setcharwidth.
+
 2005-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * smerge-mode.el (smerge-ediff): Use insert-buffer-substring.

diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 056438a2bc5db0b25c376774bffca8500dd24ab8..6cc23f7bf6b83d6ccfd5ebcba09d7f89fdc2870e 100644 (file)
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -272,18 +272,20 @@ CODE, where N and CODE are in the following relation:
            (while (search-forward "\nSTARTCHAR" nil t)
              (setq offset (line-beginning-position))
              (search-forward "\nENCODING")
-             (setq code (read (current-buffer))
-                   code0 (lsh code -8)
-                   code1 (logand code 255)
-                   min-code (min min-code code)
-                   max-code (max max-code code)
-                   min-code0 (min min-code0 code0)
-                   max-code0 (max max-code0 code0)
-                   min-code1 (min min-code1 code1)
-                   max-code1 (max max-code1 code1))
-             (search-forward "ENDCHAR")
-             (setq maxlen (max maxlen (- (point) offset))
-                   glyph-list (cons (cons code offset) glyph-list)))
+             (setq code (read (current-buffer)))
+             (if (< code 0)
+                 (search-forward "ENDCHAR")
+               (setq code0 (lsh code -8)
+                     code1 (logand code 255)
+                     min-code (min min-code code)
+                     max-code (max max-code code)
+                     min-code0 (min min-code0 code0)
+                     max-code0 (max max-code0 code0)
+                     min-code1 (min min-code1 code1)
+                     max-code1 (max max-code1 code1))
+               (search-forward "ENDCHAR")
+               (setq maxlen (max maxlen (- (point) offset))
+                     glyph-list (cons (cons code offset) glyph-list))))
 
            (setq code-range
                  (vector min-code0 max-code0 min-code1 max-code1