aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2002-07-17 08:45:51 +0000
committerKenichi Handa2002-07-17 08:45:51 +0000
commit91e854f2c3b3f4ab9e2c64df234d29c3f7ac2f44 (patch)
treece7645f8ac2bd74084aa2ff0ac016de58d522c67
parent708fc4655ea528fc410f9eb0fb7c52c9aa279d0b (diff)
downloademacs-91e854f2c3b3f4ab9e2c64df234d29c3f7ac2f44.tar.gz
emacs-91e854f2c3b3f4ab9e2c64df234d29c3f7ac2f44.zip
(print-coding-system-briefly): Fix the handling of an alias of which
eol-type is not auto-detection.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/international/mule-diag.el18
2 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d48b6dd1440..f5d23bb8519 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,7 +5,7 @@
5 eol-type is not auto-detection. 5 eol-type is not auto-detection.
6 6
7 * international/mule-diag.el (print-coding-system-briefly): Fix 7 * international/mule-diag.el (print-coding-system-briefly): Fix
8 the handling of an alias of which eol-type is not auto-detction. 8 the handling of an alias of which eol-type is not auto-detection.
9 9
10 * international/mule-conf.el (us-ascii): Define it as an alias of 10 * international/mule-conf.el (us-ascii): Define it as an alias of
11 iso-safe. 11 iso-safe.
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 8aa853b3d82..d4c4af4a19a 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -720,11 +720,19 @@ in place of `..':
720 (coding-system-mnemonic coding-system) 720 (coding-system-mnemonic coding-system)
721 coding-system)) 721 coding-system))
722 (let ((aliases (coding-system-get coding-system 'alias-coding-systems))) 722 (let ((aliases (coding-system-get coding-system 'alias-coding-systems)))
723 (if (eq coding-system (car aliases)) 723 (cond ((eq coding-system (car aliases))
724 (if (cdr aliases) 724 (if (cdr aliases)
725 (princ (format " %S" (cons 'alias: (cdr aliases))))) 725 (princ (format " %S" (cons 'alias: (cdr aliases))))))
726 (if (memq coding-system aliases) 726 ((memq coding-system aliases)
727 (princ (format " (alias of %s)" (car aliases)))))) 727 (princ (format " (alias of %s)" (car aliases))))
728 (t
729 (let ((eol-type (coding-system-eol-type coding-system))
730 (base-eol-type (coding-system-eol-type (car aliases))))
731 (if (and (integerp eol-type)
732 (vectorp base-eol-type)
733 (not (eq coding-system (aref base-eol-type eol-type))))
734 (princ (format " (alias of %s)"
735 (aref base-eol-type eol-type))))))))
728 (princ "\n\n") 736 (princ "\n\n")
729 (if (and doc-string 737 (if (and doc-string
730 (setq doc-string (coding-system-doc-string coding-system))) 738 (setq doc-string (coding-system-doc-string coding-system)))