# HG changeset patch # User Dave Love # Date 1025203194 0 # Node ID d740bbf6ca68cb8f2e0d6662c6c7536f93c15f62 # Parent d726f6eea9df79ddf230349cea964c3a04fe97f7 (sort-coding-systems): Comment out iso-2022 case. (encoded-string-description): Fix coding-system-type test. diff -r d726f6eea9df -r d740bbf6ca68 lisp/international/mule-cmds.el --- a/lisp/international/mule-cmds.el Thu Jun 27 18:37:40 2002 +0000 +++ b/lisp/international/mule-cmds.el Thu Jun 27 18:39:54 2002 +0000 @@ -252,6 +252,7 @@ "Execute an I/O command using the specified coding system." (interactive) (let* ((default (and buffer-file-coding-system + ;; Fixme: what is t here? (not (eq (coding-system-type buffer-file-coding-system) t)) buffer-file-coding-system)) @@ -393,18 +394,19 @@ (if (memq base lang-preferred) 8 0) (if (string-match "-with-esc$" (symbol-name base)) 0 4) - (if (eq (coding-system-type base) 2) - ;; For ISO based coding systems, prefer - ;; one that doesn't use escape sequences. - ;; Fixme: coding-system-spec - (let* ((extra-spec (coding-system-spec base)) - (flags (aref extra-spec 3))) - (if (/= (logand flags #x40) 0) - (if (/= (logand flags #x30) 0) - 0 - 1) - 2)) - 1))))))) +;; Fixme: sort out coding-system-spec +;; (if (eq (coding-system-type base) 'iso-2022) +;; ;; For ISO based coding systems, prefer +;; ;; one that doesn't use escape sequences. +;; (let* ((extra-spec (coding-system-spec base)) +;; (flags (aref extra-spec 3))) +;; (if (/= (logand flags #x40) 0) +;; (if (/= (logand flags #x30) 0) +;; 0 +;; 1) +;; 2)) +;; 1) + )))))) (sort codings (function (lambda (x y) (> (funcall func x) (funcall func y)))))))) @@ -2011,7 +2013,7 @@ "Return a pretty description of STR that is encoded by CODING-SYSTEM." (setq str (string-as-unibyte str)) (mapconcat - (if (and coding-system (eq (coding-system-type coding-system) 2)) + (if (and coding-system (eq (coding-system-type coding-system) 'iso-2022)) ;; Try to get a pretty description for ISO 2022 escape sequences. (function (lambda (x) (or (cdr (assq x iso-2022-control-alist)) (format "%02X" x))))