Mercurial > hg > xemacs-beta

comparison lisp/font.el @ 4727:90dbf8e772b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typo in font-combine-fonts-internal.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 01 Nov 2009 20:21:11 +0900
parents 517f6887fbc0
children aa5ed11f473b
comparison
equal deleted inserted replaced
4726:4bbda1c11a7b 4727:90dbf8e772b6
412 (font-spatial-to-canonical (font-size fontobj-2))))) 412 (font-spatial-to-canonical (font-size fontobj-2)))))
413 (set-font-weight retval (font-higher-weight (font-weight fontobj-1) 413 (set-font-weight retval (font-higher-weight (font-weight fontobj-1)
414 (font-weight fontobj-2))) 414 (font-weight fontobj-2)))
415 (set-font-family retval 415 (set-font-family retval
416 (delete-duplicates (append (font-family fontobj-1) 416 (delete-duplicates (append (font-family fontobj-1)
417 (font-family fontobj-2))) 417 (font-family fontobj-2))
418 :test #'equal) 418 :test #'equal))
419 (set-font-style retval (logior (font-style fontobj-1) 419 (set-font-style retval (logior (font-style fontobj-1)
420 (font-style fontobj-2))) 420 (font-style fontobj-2)))
421 (set-font-registry retval (or (font-registry fontobj-1) 421 (set-font-registry retval (or (font-registry fontobj-1)
422 (font-registry fontobj-2))) 422 (font-registry fontobj-2)))
423 (set-font-encoding retval (or (font-encoding fontobj-1) 423 (set-font-encoding retval (or (font-encoding fontobj-1)