diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 2008-01-31 12:43:57 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 2008-01-31 12:43:57 +0000 |
| commit | e10497104991f0be9590bb15caa7714c763b8d3c (patch) | |
| tree | 355aba21d3a20f3e304ceba5bbbee6538435de3a /x-symbol | |
| parent | a2c749794b51921685081b81883f13815b2f9d5a (diff) | |
Fix compile problem in x-symbol-mac-setup2
Diffstat (limited to 'x-symbol')
| -rw-r--r-- | x-symbol/lisp/x-symbol.el | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/x-symbol/lisp/x-symbol.el b/x-symbol/lisp/x-symbol.el index 831d4f49..6381dcec 100644 --- a/x-symbol/lisp/x-symbol.el +++ b/x-symbol/lisp/x-symbol.el @@ -4907,25 +4907,24 @@ uses it with TOKEN and CHARSYM." (defun x-symbol-mac-setup2 () - ) - ;; FIXME: disabled for now, breaks compilation -;;; (define-ccl-program ccl-encode-fake-xsymb1-font -;;; `(0 -;;; ((r2 = r1) -;;; (r1 = 0) -;;; (if (r0 == ,(charset-id 'xsymb1-right)) -;;; (r2 |= 128)))) -;;; "CCL program for fake xsymb1 font") -;;; (setq font-ccl-encoder-alist -;;; (cons (cons x-symbol-xsymb1-name ccl-encode-fake-xsymb1-font) -;;; font-ccl-encoder-alist)) -;;; (set-fontset-font nil 'xsymb1-left -;;; (cons x-symbol-xsymb1-name "iso10646-1")) -;;; (set-fontset-font nil 'xsymb1-right -;;; (cons x-symbol-xsymb1-name "iso10646-1")) -;; (dolist (face '(x-symbol-face x-symbol-sub-face x-symbol-sup-face)) -;; (set-face-attribute face nil -;; :family 'unspecified :font 'unspecified))) + (set-fontset-font nil 'xsymb1-left + (cons x-symbol-xsymb1-name "iso10646-1")) + (set-fontset-font nil 'xsymb1-right + (cons x-symbol-xsymb1-name "iso10646-1")) + (eval + '(define-ccl-program ccl-encode-fake-xsymb1-font + `(0 + ((r2 = r1) + (r1 = 0) + (if (r0 == ,(charset-id 'xsymb1-right)) + (r2 |= 128)))) + "CCL program for fake xsymb1 font")) + (setq font-ccl-encoder-alist + (cons (cons x-symbol-xsymb1-name ccl-encode-fake-xsymb1-font) + font-ccl-encoder-alist)) + (dolist (face '(x-symbol-face x-symbol-sub-face x-symbol-sup-face)) + (set-face-attribute face nil + :family 'unspecified :font 'unspecified))) ;;;=========================================================================== @@ -4962,7 +4961,7 @@ uses it with TOKEN and CHARSYM." (setq x-symbol-xsymb0-fonts nil) (setq x-symbol-xsymb1-fonts nil))) - (if (eq window-system 'mac) + (if (memq window-system '(mac ns)) (x-symbol-mac-setup1)) (x-symbol-init-cset x-symbol-latin1-cset x-symbol-latin1-fonts @@ -4982,7 +4981,7 @@ uses it with TOKEN and CHARSYM." (x-symbol-init-cset x-symbol-xsymb1-cset x-symbol-xsymb1-fonts x-symbol-xsymb1-table) - (if (eq window-system 'mac) + (if (memq window-system '(mac ns)) (x-symbol-mac-setup2))) ;; necessary for batch compilation of x-symbol-image.el etc. CW: maybe |