[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/term/x-win.el,v
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/term/x-win.el,v |
|
Date: |
Fri, 01 Feb 2008 16:03:18 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/02/01 16:01:31
Index: lisp/term/x-win.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- lisp/term/x-win.el 8 Jan 2008 20:45:45 -0000 1.221
+++ lisp/term/x-win.el 1 Feb 2008 16:01:25 -0000 1.222
@@ -1266,9 +1266,10 @@
;; This is used by DEC's X server.
'((65280 . remove)))))
+;; Latin-1
(let ((i 160))
(while (< i 256)
- (puthash i (make-char 'latin-iso8859-1 i) x-keysym-table)
+ (puthash i i x-keysym-table)
(setq i (1+ i))))
;; Table from Kuhn's proposed additions to the `KEYSYM Encoding'
@@ -1396,70 +1397,70 @@
;; Kana: Fixme: needs conversion to Japanese charset -- seems
;; to require jisx0213, for which the Unicode translation
;; isn't clear.
- (#x47e . ?$,1s>(B)
- (#x4a1 . ?$,2=B(B)
- (#x4a2 . ?\$,2=L(B)
- (#x4a3 . ?\$,2=M(B)
- (#x4a4 . ?$,2=A(B)
- (#x4a5 . ?$,2?{(B)
- (#x4a6 . ?$,2?r(B)
- (#x4a7 . ?$,2?!(B)
- (#x4a8 . ?$,2?#(B)
- (#x4a9 . ?$,2?%(B)
- (#x4aa . ?$,2?'(B)
- (#x4ab . ?$,2?)(B)
- (#x4ac . ?$,2?c(B)
- (#x4ad . ?$,2?e(B)
- (#x4ae . ?$,2?g(B)
- (#x4af . ?$,2?C(B)
- (#x4b0 . ?$,2?|(B)
- (#x4b1 . ?$,2?"(B)
- (#x4b2 . ?$,2?$(B)
- (#x4b3 . ?$,2?&(B)
- (#x4b4 . ?$,2?((B)
- (#x4b5 . ?$,2?*(B)
- (#x4b6 . ?$,2?+(B)
- (#x4b7 . ?$,2?-(B)
- (#x4b8 . ?$,2?/(B)
- (#x4b9 . ?$,2?1(B)
- (#x4ba . ?$,2?3(B)
- (#x4bb . ?$,2?5(B)
- (#x4bc . ?$,2?7(B)
- (#x4bd . ?$,2?9(B)
- (#x4be . ?$,2?;(B)
- (#x4bf . ?$,2?=(B)
- (#x4c0 . ?$,2??(B)
- (#x4c1 . ?$,2?A(B)
- (#x4c2 . ?$,2?D(B)
- (#x4c3 . ?$,2?F(B)
- (#x4c4 . ?$,2?H(B)
- (#x4c5 . ?$,2?J(B)
- (#x4c6 . ?$,2?K(B)
- (#x4c7 . ?$,2?L(B)
- (#x4c8 . ?$,2?M(B)
- (#x4c9 . ?$,2?N(B)
- (#x4ca . ?$,2?O(B)
- (#x4cb . ?$,2?R(B)
- (#x4cc . ?$,2?U(B)
- (#x4cd . ?$,2?X(B)
- (#x4ce . ?$,2?[(B)
- (#x4cf . ?$,2?^(B)
- (#x4d0 . ?$,2?_(B)
- (#x4d1 . ?$,2?`(B)
- (#x4d2 . ?$,2?a(B)
- (#x4d3 . ?$,2?b(B)
- (#x4d4 . ?$,2?d(B)
- (#x4d5 . ?$,2?f(B)
- (#x4d6 . ?$,2?h(B)
- (#x4d7 . ?$,2?i(B)
- (#x4d8 . ?$,2?j(B)
- (#x4d9 . ?$,2?k(B)
- (#x4da . ?$,2?l(B)
- (#x4db . ?$,2?m(B)
- (#x4dc . ?$,2?o(B)
- (#x4dd . ?$,2?s(B)
- (#x4de . ?$,2>{(B)
- (#x4df . ?$,2>|(B)
+ (#x47e . ?(J~(B)
+ (#x4a1 . ?$A!#(B)
+ (#x4a2 . ?\$A!8(B)
+ (#x4a3 . ?\$A!9(B)
+ (#x4a4 . ?$A!"(B)
+ (#x4a5 . ?$A!$(B)
+ (#x4a6 . ?$A%r(B)
+ (#x4a7 . ?$A%!(B)
+ (#x4a8 . ?$A%#(B)
+ (#x4a9 . ?$A%%(B)
+ (#x4aa . ?$A%'(B)
+ (#x4ab . ?$A%)(B)
+ (#x4ac . ?$A%c(B)
+ (#x4ad . ?$A%e(B)
+ (#x4ae . ?$A%g(B)
+ (#x4af . ?$A%C(B)
+ (#x4b0 . ?$B!<(B)
+ (#x4b1 . ?$A%"(B)
+ (#x4b2 . ?$A%$(B)
+ (#x4b3 . ?$A%&(B)
+ (#x4b4 . ?$A%((B)
+ (#x4b5 . ?$A%*(B)
+ (#x4b6 . ?$A%+(B)
+ (#x4b7 . ?$A%-(B)
+ (#x4b8 . ?$A%/(B)
+ (#x4b9 . ?$A%1(B)
+ (#x4ba . ?$A%3(B)
+ (#x4bb . ?$A%5(B)
+ (#x4bc . ?$A%7(B)
+ (#x4bd . ?$A%9(B)
+ (#x4be . ?$A%;(B)
+ (#x4bf . ?$A%=(B)
+ (#x4c0 . ?$A%?(B)
+ (#x4c1 . ?$A%A(B)
+ (#x4c2 . ?$A%D(B)
+ (#x4c3 . ?$A%F(B)
+ (#x4c4 . ?$A%H(B)
+ (#x4c5 . ?$A%J(B)
+ (#x4c6 . ?$A%K(B)
+ (#x4c7 . ?$A%L(B)
+ (#x4c8 . ?$A%M(B)
+ (#x4c9 . ?$A%N(B)
+ (#x4ca . ?$A%O(B)
+ (#x4cb . ?$A%R(B)
+ (#x4cc . ?$A%U(B)
+ (#x4cd . ?$A%X(B)
+ (#x4ce . ?$A%[(B)
+ (#x4cf . ?$A%^(B)
+ (#x4d0 . ?$A%_(B)
+ (#x4d1 . ?$A%`(B)
+ (#x4d2 . ?$A%a(B)
+ (#x4d3 . ?$A%b(B)
+ (#x4d4 . ?$A%d(B)
+ (#x4d5 . ?$A%f(B)
+ (#x4d6 . ?$A%h(B)
+ (#x4d7 . ?$A%i(B)
+ (#x4d8 . ?$A%j(B)
+ (#x4d9 . ?$A%k(B)
+ (#x4da . ?$A%l(B)
+ (#x4db . ?$A%m(B)
+ (#x4dc . ?$A%o(B)
+ (#x4dd . ?$A%s(B)
+ (#x4de . ?$B!+(B)
+ (#x4df . ?$B!,(B)
;; Arabic
(#x5ac . ?,G,(B)
(#x5bb . ?,G;(B)
@@ -1707,11 +1708,11 @@
(#x7f9 . ?,Fy(B)
;; Technical
(#x8a1 . ?$,1|W(B)
- (#x8a2 . ?$,2 ,(B)
- (#x8a3 . ?$,2 (B)
+ (#x8a2 . ?$A)0(B)
+ (#x8a3 . ?$A)$(B)
(#x8a4 . ?$,1{ (B)
(#x8a5 . ?$,1{!(B)
- (#x8a6 . ?$,2 "(B)
+ (#x8a6 . ?$A)&(B)
(#x8a7 . ?$,1|A(B)
(#x8a8 . ?$,1|C(B)
(#x8a9 . ?$,1|D(B)
@@ -1722,56 +1723,56 @@
(#x8ae . ?$,1|@(B)
(#x8af . ?$,1|H(B)
(#x8b0 . ?$,1|L(B)
- (#x8bc . ?$,1y$(B)
- (#x8bd . ?$,1y (B)
- (#x8be . ?$,1y%(B)
- (#x8bf . ?$,1xK(B)
- (#x8c0 . ?$,1xT(B)
- (#x8c1 . ?$,1x=(B)
- (#x8c2 . ?$,1x>(B)
- (#x8c5 . ?$,1x'(B)
- (#x8c8 . ?$,1x\(B)
- (#x8c9 . ?$,1xc(B)
- (#x8cd . ?$,1wT(B)
- (#x8ce . ?$,1wR(B)
- (#x8cf . ?$,1y!(B)
- (#x8d6 . ?$,1x:(B)
- (#x8da . ?$,1yB(B)
- (#x8db . ?$,1yC(B)
- (#x8dc . ?$,1xI(B)
- (#x8dd . ?$,1xJ(B)
- (#x8de . ?$,1xG(B)
- (#x8df . ?$,1xH(B)
- (#x8ef . ?$,1x"(B)
+ (#x8bc . ?$A!\(B)
+ (#x8bd . ?$A!Y(B)
+ (#x8be . ?$A!](B)
+ (#x8bf . ?$A!R(B)
+ (#x8c0 . ?$A!`(B)
+ (#x8c1 . ?$A!X(B)
+ (#x8c2 . ?$A!^(B)
+ (#x8c5 . ?$B"`(B)
+ (#x8c8 . ?$(G"D(B)
+ (#x8c9 . ?$(O"l(B)
+ (#x8cd . ?$B"N(B)
+ (#x8ce . ?$B"M(B)
+ (#x8cf . ?$A!T(B)
+ (#x8d6 . ?$A!L(B)
+ (#x8da . ?$B">(B)
+ (#x8db . ?$B"?(B)
+ (#x8dc . ?$A!I(B)
+ (#x8dd . ?$A!H(B)
+ (#x8de . ?$A!D(B)
+ (#x8df . ?$A!E(B)
+ (#x8ef . ?$B"_(B)
(#x8f6 . ?$,1!R(B)
- (#x8fb . ?$,1vp(B)
- (#x8fc . ?$,1vq(B)
- (#x8fd . ?$,1vr(B)
- (#x8fe . ?$,1vs(B)
+ (#x8fb . ?$A!{(B)
+ (#x8fc . ?$A!|(B)
+ (#x8fd . ?$A!z(B)
+ (#x8fe . ?$A!}(B)
;; Special
- (#x9e0 . ?$,2"&(B)
- (#x9e1 . ?$,2!R(B)
- (#x9e2 . ?$,1}I(B)
- (#x9e3 . ?$,1}L(B)
- (#x9e4 . ?$,1}M(B)
- (#x9e5 . ?$,1}J(B)
+ (#x9e0 . ?$A!t(B)
+ (#x9e1 . ?$(C"F(B)
+ (#x9e2 . ?$(GB*(B)
+ (#x9e3 . ?$(GB-(B)
+ (#x9e4 . ?$(GB.(B)
+ (#x9e5 . ?$(GB+(B)
(#x9e8 . ?$,1}d(B)
- (#x9e9 . ?$,1}K(B)
- (#x9ea . ?$,2 8(B)
- (#x9eb . ?$,2 0(B)
- (#x9ec . ?$,2 ,(B)
- (#x9ed . ?$,2 4(B)
- (#x9ee . ?$,2 \(B)
+ (#x9e9 . ?$(GB,(B)
+ (#x9ea . ?$A)<(B)
+ (#x9eb . ?$A)4(B)
+ (#x9ec . ?$A)0(B)
+ (#x9ed . ?$A)8(B)
+ (#x9ee . ?$A)`(B)
(#x9ef . ?$,1|Z(B)
(#x9f0 . ?$,1|[(B)
- (#x9f1 . ?$,2 (B)
+ (#x9f1 . ?$A)$(B)
(#x9f2 . ?$,1|\(B)
(#x9f3 . ?$,1|](B)
- (#x9f4 . ?$,2 <(B)
- (#x9f5 . ?$,2 D(B)
- (#x9f6 . ?$,2 T(B)
- (#x9f7 . ?$,2 L(B)
- (#x9f8 . ?$,2 "(B)
+ (#x9f4 . ?$A)@(B)
+ (#x9f5 . ?$A)H(B)
+ (#x9f6 . ?$A)X(B)
+ (#x9f7 . ?$A)P(B)
+ (#x9f8 . ?$A)&(B)
;; Publishing
(#xaa1 . ?$,1rc(B)
(#xaa2 . ?$,1rb(B)
@@ -1781,93 +1782,93 @@
(#xaa6 . ?$,1rh(B)
(#xaa7 . ?$,1ri(B)
(#xaa8 . ?$,1rj(B)
- (#xaa9 . ?$,1rt(B)
- (#xaaa . ?$,1rs(B)
- (#xaae . ?$,1s&(B)
- (#xaaf . ?$,1s%(B)
- (#xab0 . ?$,1v3(B)
- (#xab1 . ?$,1v4(B)
- (#xab2 . ?$,1v5(B)
+ (#xaa9 . ?$(G!7(B)
+ (#xaaa . ?$(G!9(B)
+ (#xaae . ?$A!-(B)
+ (#xaaf . ?$(G!-(B)
+ (#xab0 . ?$(O'x(B)
+ (#xab1 . ?$(O'y(B)
+ (#xab2 . ?$(O'z(B)
(#xab3 . ?$,1v6(B)
(#xab4 . ?$,1v7(B)
(#xab5 . ?$,1v8(B)
(#xab6 . ?$,1v9(B)
(#xab7 . ?$,1v:(B)
- (#xab8 . ?$,1uE(B)
+ (#xab8 . ?$(G""(B)
(#xabb . ?$,1rr(B)
(#xabc . ?$,1{)(B)
(#xabe . ?$,1{*(B)
- (#xac3 . ?$,1v;(B)
- (#xac4 . ?$,1v<(B)
- (#xac5 . ?$,1v=(B)
- (#xac6 . ?$,1v>(B)
- (#xac9 . ?$,1ub(B)
+ (#xac3 . ?$(C({(B)
+ (#xac4 . ?$(C(|(B)
+ (#xac5 . ?$(C(}(B)
+ (#xac6 . ?$(C(~(B)
+ (#xac9 . ?$(D"o(B)
(#xaca . ?$,2"s(B)
- (#xacc . ?$,2"!(B)
- (#xacd . ?$,2!w(B)
- (#xace . ?$,2"+(B)
+ (#xacc . ?$(O##(B)
+ (#xacd . ?$(O#!(B)
+ (#xace . ?$A!p(B)
(#xacf . ?$,2!o(B)
- (#xad0 . ?$,1rx(B)
- (#xad1 . ?$,1ry(B)
- (#xad2 . ?$,1r|(B)
- (#xad3 . ?$,1r}(B)
+ (#xad0 . ?,F!(B)
+ (#xad1 . ?,F"(B)
+ (#xad2 . ?,Y4(B)
+ (#xad3 . ?,Y!(B)
(#xad4 . ?$,1u^(B)
- (#xad6 . ?$,1s2(B)
- (#xad7 . ?$,1s3(B)
+ (#xad6 . ?$A!d(B)
+ (#xad7 . ?$A!e(B)
(#xad9 . ?$,2%](B)
(#xadb . ?$,2!l(B)
- (#xadc . ?$,2" (B)
- (#xadd . ?$,2!v(B)
- (#xade . ?$,2"/(B)
+ (#xadc . ?$(O#$(B)
+ (#xadd . ?$(O#"(B)
+ (#xade . ?$A!q(B)
(#xadf . ?$,2!n(B)
- (#xae0 . ?$,2"F(B)
+ (#xae0 . ?$(O#?(B)
(#xae1 . ?$,2!k(B)
(#xae2 . ?$,2!m(B)
- (#xae3 . ?$,2!s(B)
- (#xae4 . ?$,2!}(B)
- (#xae5 . ?$,2"f(B)
- (#xae6 . ?$,1s"(B)
+ (#xae3 . ?$A!w(B)
+ (#xae4 . ?$(G!}(B)
+ (#xae5 . ?$A!n(B)
+ (#xae6 . ?$(address@hidden(B)
(#xae7 . ?$,2!j(B)
- (#xae8 . ?$,2!r(B)
- (#xae9 . ?$,2!|(B)
- (#xaea . ?$,2"|(B)
- (#xaeb . ?$,2"~(B)
- (#xaec . ?$,2#c(B)
- (#xaed . ?$,2#f(B)
- (#xaee . ?$,2#e(B)
+ (#xae8 . ?$A!x(B)
+ (#xae9 . ?$(G!~(B)
+ (#xaea . ?$(C"P(B)
+ (#xaeb . ?$(O-~(B)
+ (#xaec . ?$(O&@(B)
+ (#xaed . ?$(O&<(B)
+ (#xaee . ?$(O&>(B)
(#xaf0 . ?$,2%`(B)
- (#xaf1 . ?$,1s (B)
- (#xaf2 . ?$,1s!(B)
- (#xaf3 . ?$,2%S(B)
+ (#xaf1 . ?$B"w(B)
+ (#xaf2 . ?$B"x(B)
+ (#xaf3 . ?$(O'{(B)
(#xaf4 . ?$,2%W(B)
- (#xaf5 . ?$,2#o(B)
- (#xaf6 . ?$,2#m(B)
- (#xaf7 . ?$,2#B(B)
- (#xaf8 . ?$,address@hidden(B)
- (#xaf9 . ?$,2"n(B)
+ (#xaf5 . ?$B"t(B)
+ (#xaf6 . ?$B"u(B)
+ (#xaf7 . ?$A!a(B)
+ (#xaf8 . ?$A!b(B)
+ (#xaf9 . ?$(O&g(B)
(#xafa . ?$,1zu(B)
(#xafb . ?$,1uW(B)
(#xafc . ?$,1s8(B)
(#xafd . ?$,1rz(B)
- (#xafe . ?$,1r~(B)
+ (#xafe . ?,Y%(B)
;; APL
(#xba3 . ?<)
(#xba6 . ?>)
- (#xba8 . ?$,1xH(B)
- (#xba9 . ?$,1xG(B)
+ (#xba8 . ?$A!E(B)
+ (#xba9 . ?$A!D(B)
(#xbc0 . ?,A/(B)
- (#xbc2 . ?$,1ye(B)
- (#xbc3 . ?$,1xI(B)
+ (#xbc2 . ?$A!M(B)
+ (#xbc3 . ?$A!I(B)
(#xbc4 . ?$,1zj(B)
(#xbc6 . ?_)
(#xbca . ?$,1x8(B)
(#xbcc . ?$,1|5(B)
(#xbce . ?$,1yd(B)
- (#xbcf . ?$,2"+(B)
+ (#xbcf . ?$A!p(B)
(#xbd3 . ?$,1zh(B)
- (#xbd6 . ?$,1xJ(B)
- (#xbd8 . ?$,1yC(B)
- (#xbda . ?$,1yB(B)
+ (#xbd6 . ?$A!H(B)
+ (#xbd8 . ?$B"?(B)
+ (#xbda . ?$B">(B)
(#xbdc . ?$,1yb(B)
(#xbfc . ?$,1yc(B)
;; Hebrew
@@ -2082,7 +2083,7 @@
;; Latin-9
(#x13bc . ?,b<(B)
(#x13bd . ?,b=(B)
- (#x13be . ?,b>(B)
+ (#x13be . ?,_/(B)
;; Currency
(#x20a0 . ?$,address@hidden(B)
(#x20a1 . ?$,1tA(B)
@@ -2185,112 +2186,37 @@
(defvar x-select-request-type nil
"*Data type request for X selection.
-The value is nil, one of the following data types, or a list of them:
+The value is one of the following data types, a list of them, or nil:
`COMPOUND_TEXT', `UTF8_STRING', `STRING', `TEXT'
-If the value is nil, try `COMPOUND_TEXT' and `UTF8_STRING', and
-use the more appropriate result. If both fail, try `STRING', and
-then `TEXT'.
-
If the value is one of the above symbols, try only the specified
type.
If the value is a list of them, try each of them in the specified
-order until succeed.")
+order until succeed.
-;; Helper function for x-selection-value. Select UTF8 or CTEXT
-;; whichever is more appropriate. Here, we use this heurisitcs.
-;;
-;; (1) If their lengthes are different, select the longer one. This
-;; is because an X client may just cut off unsupported characters.
-;;
-;; (2) Otherwise, if they are different at Nth character, and that
-;; of UTF8 is a Latin character and that of CTEXT belongs to a CJK
-;; character set, select UTF8. Also select UTF8 if the Nth
-;; character of UTF8 is non-ASCII where as that of CTEXT is ASCII.
-;; This is because an X client may replace unsupported characters
-;; with some ASCII character (typically ` ' or `?') in CTEXT.
-;;
-;; (3) Otherwise, select CTEXT. This is because legacy charsets are
-;; better for the current Emacs, especially when the selection owner
-;; is also Emacs.
-
-(defun x-select-utf8-or-ctext (utf8 ctext)
- (let ((len-utf8 (length utf8))
- (len-ctext (length ctext))
- (selected ctext)
- (i 0)
- char)
- (if (/= len-utf8 len-ctext)
- (if (> len-utf8 len-ctext) utf8 ctext)
- (let ((result (compare-strings utf8 0 len-utf8 ctext 0 len-ctext)))
- (if (eq result t)
- ctext
- (let ((utf8-char (aref utf8 (1- (abs result))))
- (ctext-char (aref ctext (1- (abs result)))))
- (if (or (and (aref (char-category-set utf8-char) ?l)
- (aref (char-category-set ctext-char) ?C))
- (and (>= utf8-char 128)
- (< ctext-char 128)))
- utf8
- ctext)))))))
+The value nil is the same as this list:
+ \(UTF8_STRING COMPOUND_TEXT STRING)
+")
;; Get a selection value of type TYPE by calling x-get-selection with
-;; an appropiate DATA-TYPE argument decidd by `x-select-request-type'.
+;; an appropiate DATA-TYPE argument decided by `x-select-request-type'.
;; The return value is already decoded. If x-get-selection causes an
;; error, this function return nil.
(defun x-selection-value (type)
- (let (text)
- (cond ((null x-select-request-type)
- (let (utf8 ctext utf8-coding)
- ;; We try both UTF8_STRING and COMPOUND_TEXT, and choose
- ;; the more appropriate one. If both fail, try STRING.
-
- ;; At first try UTF8_STRING.
- (setq utf8 (condition-case nil
- (x-get-selection type 'UTF8_STRING)
- (error nil))
- utf8-coding last-coding-system-used)
- (if utf8
- ;; If it is a local selection, or it contains only
- ;; ASCII characers, choose it.
- (if (or (not (get-text-property 0 'foreign-selection utf8))
- (= (length utf8) (string-bytes utf8)))
- (setq text utf8)))
- ;; If not yet decided, try COMPOUND_TEXT.
- (if (not text)
- (if (setq ctext (condition-case nil
- (x-get-selection type 'COMPOUND_TEXT)
- (error nil)))
- ;; If UTF8_STRING was also successful, choose the
- ;; more appropriate one from UTF8 and CTEXT.
- (if utf8
- (setq text (x-select-utf8-or-ctext utf8 ctext))
- ;; Othewise, choose CTEXT.
- (setq text ctext))
- (setq text utf8)))
- ;; If not yet decided, try STRING.
- (or text
- (setq text (condition-case nil
- (x-get-selection type 'STRING)
- (error nil))))
- (if (eq text utf8)
- (setq last-coding-system-used utf8-coding))))
-
- ((consp x-select-request-type)
- (let ((tail x-select-request-type))
- (while (and tail (not text))
+ (let ((request-type (or x-select-request-type
+ '(UTF8_STRING COMPOUND_TEXT STRING)))
+ text)
+ (if (consp request-type)
+ (while (and request-type (not text))
(condition-case nil
- (setq text (x-get-selection type (car tail)))
+ (setq text (x-get-selection type (car request-type)))
(error nil))
- (setq tail (cdr tail)))))
-
- (t
+ (setq request-type (cdr request-type)))
(condition-case nil
- (setq text (x-get-selection type x-select-request-type))
- (error nil))))
-
+ (setq text (x-get-selection type request-type))
+ (error nil)))
(if text
(remove-text-properties 0 (length text) '(foreign-selection nil) text))
text))
@@ -2457,28 +2383,6 @@
;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
(create-fontset-from-x-resource)
- ;; Try to create a fontset from a font specification which comes
- ;; from initial-frame-alist, default-frame-alist, or X resource.
- ;; A font specification in command line argument (i.e. -fn XXXX)
- ;; should be already in default-frame-alist as a `font'
- ;; parameter. However, any font specifications in site-start
- ;; library, user's init file (.emacs), and default.el are not
- ;; yet handled here.
-
- (let ((font (or (cdr (assq 'font initial-frame-alist))
- (cdr (assq 'font default-frame-alist))
- (x-get-resource "font" "Font")))
- xlfd-fields resolved-name)
- (if (and font
- (not (query-fontset font))
- (setq resolved-name (x-resolve-font-name font))
- (setq xlfd-fields (x-decompose-font-name font)))
- (if (string= "fontset" (aref xlfd-fields xlfd-regexp-registry-subnum))
- (new-fontset font (x-complement-fontset-spec xlfd-fields nil))
- ;; Create a fontset from FONT. The fontset name is
- ;; generated from FONT.
- (create-fontset-from-ascii-font font resolved-name "startup"))))
-
;; Set scroll bar mode to right if set by X resources. Default is left.
(if (equal (x-get-resource "verticalScrollBars" "ScrollBars") "right")
(customize-set-variable 'scroll-bar-mode 'right))
- [Emacs-diffs] Changes to emacs/lisp/term/x-win.el,v,
Miles Bader <=