comparison lisp/mule/mule-cmds.el @ 4498:f0c81cd2a959

Merge.
author Mats Lidell <matsl@xemacs.org>
date Sun, 10 Aug 2008 23:24:15 +0200
parents 67fbcaf3dbdc
children 774e5c7522bf
comparison
equal deleted inserted replaced
4497:f863b2ee146f 4498:f0c81cd2a959
223 LANG if there's no SUBLANG. The return value will be 223 LANG if there's no SUBLANG. The return value will be
224 the canonicalized locale, in proper CLIB form.) 224 the canonicalized locale, in proper CLIB form.)
225 225
226 If there is no value for this property, the MS Windows 226 If there is no value for this property, the MS Windows
227 locale is assumed to have the same name as the 227 locale is assumed to have the same name as the
228 language environment." 228 language environment.
229
230 invalid-sequence-coding-system
231 VALUE is a fixed-width 8-bit coding system used to
232 display Unicode error sequences (using a face to make
233 it clear that the data is invalid). In Western Europe
234 this is normally windows-1252; in the Russia and the
235 former Soviet Union koi8-ru or windows-1251 makes more
236 sense."
229 (if (symbolp lang-env) 237 (if (symbolp lang-env)
230 (setq lang-env (symbol-name lang-env))) 238 (setq lang-env (symbol-name lang-env)))
231 (let (lang-slot prop-slot) 239 (let (lang-slot prop-slot)
232 (setq lang-slot (assoc lang-env language-info-alist)) 240 (setq lang-slot (assoc lang-env language-info-alist))
233 (if (null lang-slot) ; If no slot for the language, add it. 241 (if (null lang-slot) ; If no slot for the language, add it.
757 (require (car required-features)) 765 (require (car required-features))
758 (setq required-features (cdr required-features)))) 766 (setq required-features (cdr required-features))))
759 (let ((func (get-language-info language-name 'setup-function))) 767 (let ((func (get-language-info language-name 'setup-function)))
760 (if (functionp func) 768 (if (functionp func)
761 (funcall func))) 769 (funcall func)))
770
771 (let ((invalid-sequence-coding-system
772 (get-language-info language-name 'invalid-sequence-coding-system))
773 (disp-table (specifier-instance current-display-table))
774 glyph)
775 (when (consp invalid-sequence-coding-system)
776 (setq invalid-sequence-coding-system
777 (car invalid-sequence-coding-system)))
778 (map-char-table
779 #'(lambda (key entry)
780 (setq glyph (make-glyph
781 (vector
782 'string :data
783 (decode-coding-string (string entry)
784 invalid-sequence-coding-system))))
785 (set-glyph-face glyph 'unicode-invalid-sequence-warning-face)
786 (put-char-table key glyph disp-table)
787 nil)
788 unicode-error-default-translation-table))
762 789
763 ;; Fit the charsets preferences in unicode conversions for the 790 ;; Fit the charsets preferences in unicode conversions for the
764 ;; language environment. 791 ;; language environment.
765 (set-language-unicode-precedence-list 792 (set-language-unicode-precedence-list
766 (get-language-info language-name 'charset)) 793 (get-language-info language-name 'charset))