[Emacs-diffs] Changes to emacs/lisp/international/mule-util.el [emacs-unicode-2]

[Kenichi Handa]

Index: emacs/lisp/international/mule-util.el
diff -c emacs/lisp/international/mule-util.el:1.51.6.6 
emacs/lisp/international/mule-util.el:1.51.6.7
*** emacs/lisp/international/mule-util.el:1.51.6.6      Wed Dec  8 05:02:28 2004
--- emacs/lisp/international/mule-util.el       Thu Dec  9 12:37:05 2004
***************
*** 371,384 ****
         ;; currently selected frame.
         (car (internal-char-font nil char)))
        (t
!        (let ((coding (terminal-coding-system)))
           (if coding
!              (let ((safe-chars (coding-system-get coding 'safe-chars))
!                    (safe-charsets (coding-system-get coding 'safe-charsets)))
!                (or (and safe-chars
!                         (aref safe-chars char))
!                    (and safe-charsets
!                         (memq (char-charset char) safe-charsets)))))))))
  
  (provide 'mule-util)
  
--- 371,405 ----
         ;; currently selected frame.
         (car (internal-char-font nil char)))
        (t
!        (let ((coding 'iso-2022-7bit))
           (if coding
!              (let ((cs-list (coding-system-get coding :charset-list)))
!                (cond
!                 ((listp cs-list)
!                  (catch 'tag
!                    (mapc #'(lambda (charset) 
!                              (if (encode-char char charset)
!                                  (throw 'tag charset)))
!                          cs-list)
!                    nil))
!                 ((eq cs-list 'iso-2022)
!                  (catch 'tag2
!                    (mapc #'(lambda (charset)
!                              (if (and (plist-get (charset-plist charset)
!                                                  :iso-final-char)
!                                       (encode-char char charset))
!                                  (throw 'tag2 charset)))
!                          charset-list)
!                    nil))
!                 ((eq cs-list 'emacs-mule)
!                  (catch 'tag3
!                    (mapc #'(lambda (charset)
!                              (if (and (plist-get (charset-plist charset) 
!                                                  :emacs-mule-id)
!                                       (encode-char char charset))
!                                  (throw 'tag3 charset)))
!                          charset-list)
!                    nil)))))))))
  
  (provide 'mule-util)