(describe-current-coding-system): Clean up output format.

1 files changed, 14 insertions, 15 deletions

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 417eddd79d5..85df7141788 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -272,24 +272,23 @@ at the place of `..':
   (with-output-to-temp-buffer "*Help*"
     (let* ((proc (get-buffer-process (current-buffer)))
            (process-coding-systems (if proc (process-coding-system proc))))
-      (princ "Current buffer file: buffer-file-coding-system\n  ")
+      (princ "Coding system for saving this buffer:\n  ")
       (if (local-variable-p 'buffer-file-coding-system)
           (print-coding-system-briefly buffer-file-coding-system)
-        (princ "Not set locally, use the following default.\n"))
-      (princ "Default buffer file: default-buffer-file-coding-system\n  ")
+        (princ "Not set locally, use the default.\n"))
+      (princ "Default coding system (for new files):\n  ")
       (print-coding-system-briefly default-buffer-file-coding-system)
-      (princ "Keyboard: (keyboard-coding-system)\n  ")
+      (princ "Coding system for keyboard input:\n  ")
       (print-coding-system-briefly (keyboard-coding-system))
-      (princ "Terminal: (display-coding-system)\n  ")
+      (princ "Coding system for terminal output:\n  ")
       (print-coding-system-briefly (terminal-coding-system))
-      (princ "Current buffer process: (process-coding-system)\n")
-      (if (not process-coding-systems)
-          (princ "  No process.\n")
-        (princ "  decoding: ")
-        (print-coding-system-briefly (car process-coding-systems))
-        (princ "  encoding: ")
-        (print-coding-system-briefly (cdr process-coding-systems)))
-      (princ "Default process: default-process-coding-system\n")
+      (when (get-buffer-process (current-buffer))
+        (princ "Coding systems for process I/O:\n")
+        (princ "  encoding input to the process: ")
+        (print-coding-system-briefly (cdr process-coding-systems))
+        (princ "  decoding output from the process: ")
+        (print-coding-system-briefly (car process-coding-systems)))
+      (princ "Defaults for subprocess I/O:")
       (princ "  decoding: ")
       (print-coding-system-briefly (car default-process-coding-system))
       (princ "  encoding: ")
@@ -298,7 +297,7 @@ at the place of `..':
     (save-excursion
       (set-buffer standard-output)
 
-      (princ "\nPriority order of coding systems:\n")
+      (princ "\nPriority order for recognizing coding systems when reading files:\n")
       (let ((l coding-category-list)
             (i 1)
             coding aliases)
@@ -342,7 +341,7 @@ at the place of `..':
                 (insert "\n\n")))
           (setq categories (cdr categories))))
 
-      (princ "Look up tables for finding a coding system on I/O operations:\n")
+      (princ "Particular coding systems specified for certain file names:\n")
       (terpri)
       (princ "  OPERATION\tTARGET PATTERN\t\tCODING SYSTEM(s)\n")
       (princ "  ---------\t--------------\t\t----------------\n")