diff options
| author | Paul Eggert | 2015-06-12 13:39:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-06-12 13:40:29 -0700 |
| commit | 203e84c6cf9b8356e376cc748b5ed331df96dc9e (patch) | |
| tree | 2ff6e8345d10dfbe552a7546a4816126284d7163 | |
| parent | b63d0a5ab3161ca306e572d2fa00cfd68681fa84 (diff) | |
| download | emacs-203e84c6cf9b8356e376cc748b5ed331df96dc9e.tar.gz emacs-203e84c6cf9b8356e376cc748b5ed331df96dc9e.zip | |
Configure Symbola font only if installed
* lisp/international/fontset.el (setup-default-fontset):
Don't specify the Symbola font if it's not installed.
Likewise for FreeMono. (Bug#20727)
| -rw-r--r-- | lisp/international/fontset.el | 81 |
1 files changed, 42 insertions, 39 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 6fd1b525d6d..14f30c15ac3 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -695,46 +695,49 @@ | |||
| 695 | 695 | ||
| 696 | ;; Special setup for various symbols and some rarely used characters | 696 | ;; Special setup for various symbols and some rarely used characters |
| 697 | ;; covered well by Symbola. | 697 | ;; covered well by Symbola. |
| 698 | (dolist (symbol-subgroup '((#x0250 . #x02AF) ;; IPA Extensions | 698 | (when (find-font (font-spec :name "Symbola")) |
| 699 | (#x2000 . #x206F) ;; General Punctuation | 699 | (dolist (symbol-subgroup |
| 700 | (#x2070 . #x209F) ;; Superscripts and Subscripts | 700 | '((#x0250 . #x02AF) ;; IPA Extensions |
| 701 | (#x20A0 . #x20CF) ;; Currency Symbols | 701 | (#x2000 . #x206F) ;; General Punctuation |
| 702 | (#x2100 . #x214F) ;; Letterlike Symbols | 702 | (#x2070 . #x209F) ;; Superscripts and Subscripts |
| 703 | (#x2150 . #x218F) ;; Number Forms | 703 | (#x20A0 . #x20CF) ;; Currency Symbols |
| 704 | (#x2190 . #x21FF) ;; Arrows | 704 | (#x2100 . #x214F) ;; Letterlike Symbols |
| 705 | (#x2200 . #x22FF) ;; Mathematical Operators | 705 | (#x2150 . #x218F) ;; Number Forms |
| 706 | (#x2300 . #x23FF) ;; Miscellaneous Technical | 706 | (#x2190 . #x21FF) ;; Arrows |
| 707 | (#x2400 . #x243F) ;; Control Pictures | 707 | (#x2200 . #x22FF) ;; Mathematical Operators |
| 708 | (#x2440 . #x245F) ;; Optical Char Recognition | 708 | (#x2300 . #x23FF) ;; Miscellaneous Technical |
| 709 | (#x2460 . #x24FF) ;; Enclosed Alphanumerics | 709 | (#x2400 . #x243F) ;; Control Pictures |
| 710 | (#x25A0 . #x25FF) ;; Geometric Shapes | 710 | (#x2440 . #x245F) ;; Optical Char Recognition |
| 711 | (#x2600 . #x26FF) ;; Miscellaneous Symbols | 711 | (#x2460 . #x24FF) ;; Enclosed Alphanumerics |
| 712 | (#x2700 . #x27bF) ;; Dingbats | 712 | (#x25A0 . #x25FF) ;; Geometric Shapes |
| 713 | (#x27C0 . #x27EF) ;; Misc Mathematical Symbols-A | 713 | (#x2600 . #x26FF) ;; Miscellaneous Symbols |
| 714 | (#x27F0 . #x27FF) ;; Supplemental Arrows-A | 714 | (#x2700 . #x27bF) ;; Dingbats |
| 715 | (#x2900 . #x297F) ;; Supplemental Arrows-B | 715 | (#x27C0 . #x27EF) ;; Misc Mathematical Symbols-A |
| 716 | (#x2980 . #x29FF) ;; Misc Mathematical Symbols-B | 716 | (#x27F0 . #x27FF) ;; Supplemental Arrows-A |
| 717 | (#x2A00 . #x2AFF) ;; Suppl. Math Operators | 717 | (#x2900 . #x297F) ;; Supplemental Arrows-B |
| 718 | (#x2B00 . #x2BFF) ;; Misc Symbols and Arrows | 718 | (#x2980 . #x29FF) ;; Misc Mathematical Symbols-B |
| 719 | (#x2E00 . #x2E7F) ;; Supplemental Punctuation | 719 | (#x2A00 . #x2AFF) ;; Suppl. Math Operators |
| 720 | (#x4DC0 . #x4DFF) ;; Yijing Hexagram Symbols | 720 | (#x2B00 . #x2BFF) ;; Misc Symbols and Arrows |
| 721 | (#xFE10 . #xFE1F) ;; Vertical Forms | 721 | (#x2E00 . #x2E7F) ;; Supplemental Punctuation |
| 722 | (#x10100 . #x1013F) ;; Aegean Numbers | 722 | (#x4DC0 . #x4DFF) ;; Yijing Hexagram Symbols |
| 723 | (#x102E0 . #x102FF) ;; Coptic Epact Numbers | 723 | (#xFE10 . #xFE1F) ;; Vertical Forms |
| 724 | (#x1D000 . #x1D0FF) ;; Byzanthine Musical Symbols | 724 | (#x10100 . #x1013F) ;; Aegean Numbers |
| 725 | (#x1D200 . #x1D24F) ;; Ancient Greek Musical Notation | 725 | (#x102E0 . #x102FF) ;; Coptic Epact Numbers |
| 726 | (#x1F0A0 . #x1F0FF) ;; Playing Cards | 726 | (#x1D000 . #x1D0FF) ;; Byzanthine Musical Symbols |
| 727 | (#x1F100 . #x1F1FF) ;; Enclosed Alphanumeric Suppl | 727 | (#x1D200 . #x1D24F) ;; Ancient Greek Musical Notation |
| 728 | (#x1F300 . #x1F5FF) ;; Misc Symbols and Pictographs | 728 | (#x1F0A0 . #x1F0FF) ;; Playing Cards |
| 729 | (#x1F600 . #x1F64F) ;; Emoticons | 729 | (#x1F100 . #x1F1FF) ;; Enclosed Alphanumeric Suppl |
| 730 | (#x1F650 . #x1F67F) ;; Ornamental Dingbats | 730 | (#x1F300 . #x1F5FF) ;; Misc Symbols and Pictographs |
| 731 | (#x1F680 . #x1F6FF) ;; Transport and Map Symbols | 731 | (#x1F600 . #x1F64F) ;; Emoticons |
| 732 | (#x1F700 . #x1F77F) ;; Alchemical Symbols | 732 | (#x1F650 . #x1F67F) ;; Ornamental Dingbats |
| 733 | (#x1F780 . #x1F7FF) ;; Geometric Shapes Extended | 733 | (#x1F680 . #x1F6FF) ;; Transport and Map Symbols |
| 734 | (#x1F800 . #x1F8FF))) ;; Supplemental Arrows-C | 734 | (#x1F700 . #x1F77F) ;; Alchemical Symbols |
| 735 | (set-fontset-font "fontset-default" symbol-subgroup "Symbola")) | 735 | (#x1F780 . #x1F7FF) ;; Geometric Shapes Extended |
| 736 | (#x1F800 . #x1F8FF))) ;; Supplemental Arrows-C | ||
| 737 | (set-fontset-font "fontset-default" symbol-subgroup "Symbola"))) | ||
| 736 | ;; Box Drawing and Block Elements | 738 | ;; Box Drawing and Block Elements |
| 737 | (set-fontset-font "fontset-default" '(#x2500 . #x259F) "FreeMono") | 739 | (when (find-font (font-spec "FreeMono")) |
| 740 | (set-fontset-font "fontset-default" '(#x2500 . #x259F) "FreeMono")) | ||
| 738 | 741 | ||
| 739 | ;; Append CJK fonts for characters other than han, kana, cjk-misc. | 742 | ;; Append CJK fonts for characters other than han, kana, cjk-misc. |
| 740 | ;; Append fonts for scripts whose name is also a charset name. | 743 | ;; Append fonts for scripts whose name is also a charset name. |