diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/international/mule-diag.el | 18 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d48b6dd144..f5d23bb851 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,7 +5,7 @@ eol-type is not auto-detection. * international/mule-diag.el (print-coding-system-briefly): Fix - the handling of an alias of which eol-type is not auto-detction. + the handling of an alias of which eol-type is not auto-detection. * international/mule-conf.el (us-ascii): Define it as an alias of iso-safe. diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index 8aa853b3d8..d4c4af4a19 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -720,11 +720,19 @@ in place of `..': (coding-system-mnemonic coding-system) coding-system)) (let ((aliases (coding-system-get coding-system 'alias-coding-systems))) - (if (eq coding-system (car aliases)) - (if (cdr aliases) - (princ (format " %S" (cons 'alias: (cdr aliases))))) - (if (memq coding-system aliases) - (princ (format " (alias of %s)" (car aliases)))))) + (cond ((eq coding-system (car aliases)) + (if (cdr aliases) + (princ (format " %S" (cons 'alias: (cdr aliases)))))) + ((memq coding-system aliases) + (princ (format " (alias of %s)" (car aliases)))) + (t + (let ((eol-type (coding-system-eol-type coding-system)) + (base-eol-type (coding-system-eol-type (car aliases)))) + (if (and (integerp eol-type) + (vectorp base-eol-type) + (not (eq coding-system (aref base-eol-type eol-type)))) + (princ (format " (alias of %s)" + (aref base-eol-type eol-type)))))))) (princ "\n\n") (if (and doc-string (setq doc-string (coding-system-doc-string coding-system))) |