Mercurial > emacs
comparison lisp/faces.el @ 8732:58d6dc80af5c
(make-face-unbold, make-face-unitalic, make-face-bold, make-face-italic,
make-face-bold-italic): Don't try to frob font if it's nil.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 14 Sep 1994 03:22:57 +0000 |
| parents | 3043fef029a7 |
| children | c3a04b8a2786 |
comparison
equal
deleted
inserted
replaced
| 8731:7ebb77d4aff2 | 8732:58d6dc80af5c |
|---|---|
| 542 (if (listp font) | 542 (if (listp font) |
| 543 (setq font nil)) | 543 (setq font nil)) |
| 544 (setq font (or font | 544 (setq font (or font |
| 545 (face-font 'default frame) | 545 (face-font 'default frame) |
| 546 (cdr (assq 'font (frame-parameters frame))))) | 546 (cdr (assq 'font (frame-parameters frame))))) |
| 547 (make-face-bold-internal face frame font)) | 547 (and font (make-face-bold-internal face frame font))) |
| 548 (or (not (equal ofont (face-font face))) | 548 (or (not (equal ofont (face-font face))) |
| 549 (and (not noerror) | 549 (and (not noerror) |
| 550 (error "No bold version of %S" font)))))) | 550 (error "No bold version of %S" font)))))) |
| 551 | 551 |
| 552 (defun make-face-bold-internal (face frame font) | 552 (defun make-face-bold-internal (face frame font) |
| 580 (if (listp font) | 580 (if (listp font) |
| 581 (setq font nil)) | 581 (setq font nil)) |
| 582 (setq font (or font | 582 (setq font (or font |
| 583 (face-font 'default frame) | 583 (face-font 'default frame) |
| 584 (cdr (assq 'font (frame-parameters frame))))) | 584 (cdr (assq 'font (frame-parameters frame))))) |
| 585 (make-face-italic-internal face frame font)) | 585 (and font (make-face-italic-internal face frame font))) |
| 586 (or (not (equal ofont (face-font face))) | 586 (or (not (equal ofont (face-font face))) |
| 587 (and (not noerror) | 587 (and (not noerror) |
| 588 (error "No italic version of %S" font)))))) | 588 (error "No italic version of %S" font)))))) |
| 589 | 589 |
| 590 (defun make-face-italic-internal (face frame font) | 590 (defun make-face-italic-internal (face frame font) |
| 616 (if (listp font) | 616 (if (listp font) |
| 617 (setq font nil)) | 617 (setq font nil)) |
| 618 (setq font (or font | 618 (setq font (or font |
| 619 (face-font 'default frame) | 619 (face-font 'default frame) |
| 620 (cdr (assq 'font (frame-parameters frame))))) | 620 (cdr (assq 'font (frame-parameters frame))))) |
| 621 (make-face-bold-italic-internal face frame font)) | 621 (and font (make-face-bold-italic-internal face frame font))) |
| 622 (or (not (equal ofont (face-font face))) | 622 (or (not (equal ofont (face-font face))) |
| 623 (and (not noerror) | 623 (and (not noerror) |
| 624 (error "No bold italic version of %S" font)))))) | 624 (error "No bold italic version of %S" font)))))) |
| 625 | 625 |
| 626 (defun make-face-bold-italic-internal (face frame font) | 626 (defun make-face-bold-italic-internal (face frame font) |
| 670 (if (listp font1) | 670 (if (listp font1) |
| 671 (setq font1 nil)) | 671 (setq font1 nil)) |
| 672 (setq font1 (or font1 | 672 (setq font1 (or font1 |
| 673 (face-font 'default frame) | 673 (face-font 'default frame) |
| 674 (cdr (assq 'font (frame-parameters frame))))) | 674 (cdr (assq 'font (frame-parameters frame))))) |
| 675 (setq font (x-make-font-unbold font1)) | 675 (setq font (and font1 (x-make-font-unbold font1))) |
| 676 (if font (internal-try-face-font face font frame))) | 676 (if font (internal-try-face-font face font frame))) |
| 677 (or (not (equal ofont (face-font face))) | 677 (or (not (equal ofont (face-font face))) |
| 678 (and (not noerror) | 678 (and (not noerror) |
| 679 (error "No unbold version of %S" font1)))))) | 679 (error "No unbold version of %S" font1)))))) |
| 680 | 680 |
| 702 (if (listp font1) | 702 (if (listp font1) |
| 703 (setq font1 nil)) | 703 (setq font1 nil)) |
| 704 (setq font1 (or font1 | 704 (setq font1 (or font1 |
| 705 (face-font 'default frame) | 705 (face-font 'default frame) |
| 706 (cdr (assq 'font (frame-parameters frame))))) | 706 (cdr (assq 'font (frame-parameters frame))))) |
| 707 (setq font (x-make-font-unitalic font1)) | 707 (setq font (and font1 (x-make-font-unitalic font1))) |
| 708 (if font (internal-try-face-font face font frame))) | 708 (if font (internal-try-face-font face font frame))) |
| 709 (or (not (equal ofont (face-font face))) | 709 (or (not (equal ofont (face-font face))) |
| 710 (and (not noerror) | 710 (and (not noerror) |
| 711 (error "No unitalic version of %S" font1)))))) | 711 (error "No unitalic version of %S" font1)))))) |
| 712 | 712 |