[Emacs-diffs] Changes to emacs/lisp/international/mule-diag.el

[Stefan Monnier]

Index: emacs/lisp/international/mule-diag.el
diff -c emacs/lisp/international/mule-diag.el:1.78 
emacs/lisp/international/mule-diag.el:1.79
*** emacs/lisp/international/mule-diag.el:1.78  Wed Jul 17 04:45:28 2002
--- emacs/lisp/international/mule-diag.el       Thu Sep 19 01:06:16 2002
***************
*** 46,52 ****
  (defun sort-charset-list ()
    (setq charset-list
        (sort charset-list
!             (function (lambda (x y) (< (charset-id x) (charset-id y)))))))
  
  ;;; CHARSET
  
--- 46,52 ----
  (defun sort-charset-list ()
    (setq charset-list
        (sort charset-list
!             (lambda (x y) (< (charset-id x) (charset-id y))))))
  
  ;;; CHARSET
  
***************
*** 175,194 ****
      ;; Determine a predicate for `sort' by SORT-KEY.
      (setq sort-func
          (cond ((eq sort-key 'id)
!                (function (lambda (x y) (< (car x) (car y)))))
  
                ((eq sort-key 'name)
!                (function (lambda (x y) (string< (nth 1 x) (nth 1 y)))))
  
                ((eq sort-key 'iso-spec)
                 ;; Sort by DIMENSION CHARS FINAL-CHAR
!                (function
!                 (lambda (x y)
!                   (or (< (nth 3 x) (nth 3 y))
!                       (and (= (nth 3 x) (nth 3 y))
!                            (or (< (nth 4 x) (nth 4 y))
!                                (and (= (nth 4 x) (nth 4 y))
!                                     (< (nth 5 x) (nth 5 y)))))))))
                (t
                 (error "Invalid charset sort key: %s" sort-key))))
  
--- 175,193 ----
      ;; Determine a predicate for `sort' by SORT-KEY.
      (setq sort-func
          (cond ((eq sort-key 'id)
!                (lambda (x y) (< (car x) (car y))))
  
                ((eq sort-key 'name)
!                (lambda (x y) (string< (nth 1 x) (nth 1 y))))
  
                ((eq sort-key 'iso-spec)
                 ;; Sort by DIMENSION CHARS FINAL-CHAR
!                (lambda (x y)
!                  (or (< (nth 3 x) (nth 3 y))
!                      (and (= (nth 3 x) (nth 3 y))
!                           (or (< (nth 4 x) (nth 4 y))
!                               (and (= (nth 4 x) (nth 4 y))
!                                    (< (nth 5 x) (nth 5 y))))))))
                (t
                 (error "Invalid charset sort key: %s" sort-key))))
  
***************
*** 353,362 ****
  INITIAL-INPUT, if non-nil, is a string inserted in the minibuffer initially.
  See the documentation of the function `completing-read' for the
  detailed meanings of these arguments."
!   (let* ((table (append (mapcar (function (lambda (x) (list (symbol-name x))))
                                charset-list)
!                       (mapcar (function (lambda (x)
!                                           (list (symbol-name (car x)))))
                                non-iso-charset-alist)))
         (charset (completing-read prompt table
                                   nil t initial-input 'charset-history
--- 352,360 ----
  INITIAL-INPUT, if non-nil, is a string inserted in the minibuffer initially.
  See the documentation of the function `completing-read' for the
  detailed meanings of these arguments."
!   (let* ((table (append (mapcar (lambda (x) (list (symbol-name x)))
                                charset-list)
!                       (mapcar (lambda (x) (list (symbol-name (car x))))
                                non-iso-charset-alist)))
         (charset (completing-read prompt table
                                   nil t initial-input 'charset-history
***************
*** 586,640 ****
      (with-output-to-temp-buffer (help-buffer)
        (print-coding-system-briefly coding-system 'doc-string)
        (princ "\n")
!       (let ((coding-spec (coding-system-spec coding-system)))
!       (princ "Type: ")
!       (let ((type (coding-system-type coding-system))
!             (flags (coding-system-flags coding-system)))
!         (princ type)
!         (cond ((eq type nil)
!                (princ " (do no conversion)"))
!               ((eq type t)
!                (princ " (do automatic conversion)"))
!               ((eq type 0)
!                (princ " (Emacs internal multibyte form)"))
!               ((eq type 1)
!                (princ " (Shift-JIS, MS-KANJI)"))
!               ((eq type 2)
!                (princ " (variant of ISO-2022)\n")
!                (princ "Initial designations:\n")
!                (print-designation flags)
!                (princ "Other Form: \n  ")
!                (princ (if (aref flags 4) "short-form" "long-form"))
!                (if (aref flags 5) (princ ", address@hidden"))
!                (if (aref flags 6) (princ ", address@hidden"))
!                (princ (if (aref flags 7) ", 7-bit" ", 8-bit"))
!                (if (aref flags 8) (princ ", use-locking-shift"))
!                (if (aref flags 9) (princ ", use-single-shift"))
!                (if (aref flags 10) (princ ", use-roman"))
!                (if (aref flags 11) (princ ", use-old-jis"))
!                (if (aref flags 12) (princ ", no-ISO6429"))
!                (if (aref flags 13) (princ ", init-bol"))
!                (if (aref flags 14) (princ ", designation-bol"))
!                (if (aref flags 15) (princ ", convert-unsafe"))
!                (if (aref flags 16) (princ ", accept-latin-extra-code"))
!                (princ "."))
!               ((eq type 3)
!                (princ " (Big5)"))
!               ((eq type 4)
!                (princ " (do conversion by CCL program)"))
!               ((eq type 5)
!                (princ " (text with random binary characters)"))
!               (t (princ ": invalid coding-system."))))
!       (princ "\nEOL type: ")
!       (let ((eol-type (coding-system-eol-type coding-system)))
!         (cond ((vectorp eol-type)
!                (princ "Automatic selection from:\n\t")
!                (princ eol-type)
!                (princ "\n"))
!               ((or (null eol-type) (eq eol-type 0)) (princ "LF\n"))
!               ((eq eol-type 1) (princ "CRLF\n"))
!               ((eq eol-type 2) (princ "CR\n"))
!               (t (princ "invalid\n")))))
        (let ((postread (coding-system-get coding-system 
'post-read-conversion)))
        (when postread
          (princ "After decoding text normally,")
--- 584,637 ----
      (with-output-to-temp-buffer (help-buffer)
        (print-coding-system-briefly coding-system 'doc-string)
        (princ "\n")
!       (princ "Type: ")
!       (let ((type (coding-system-type coding-system))
!           (flags (coding-system-flags coding-system)))
!       (princ type)
!       (cond ((eq type nil)
!              (princ " (do no conversion)"))
!             ((eq type t)
!              (princ " (do automatic conversion)"))
!             ((eq type 0)
!              (princ " (Emacs internal multibyte form)"))
!             ((eq type 1)
!              (princ " (Shift-JIS, MS-KANJI)"))
!             ((eq type 2)
!              (princ " (variant of ISO-2022)\n")
!              (princ "Initial designations:\n")
!              (print-designation flags)
!              (princ "Other Form: \n  ")
!              (princ (if (aref flags 4) "short-form" "long-form"))
!              (if (aref flags 5) (princ ", address@hidden"))
!              (if (aref flags 6) (princ ", address@hidden"))
!              (princ (if (aref flags 7) ", 7-bit" ", 8-bit"))
!              (if (aref flags 8) (princ ", use-locking-shift"))
!              (if (aref flags 9) (princ ", use-single-shift"))
!              (if (aref flags 10) (princ ", use-roman"))
!              (if (aref flags 11) (princ ", use-old-jis"))
!              (if (aref flags 12) (princ ", no-ISO6429"))
!              (if (aref flags 13) (princ ", init-bol"))
!              (if (aref flags 14) (princ ", designation-bol"))
!              (if (aref flags 15) (princ ", convert-unsafe"))
!              (if (aref flags 16) (princ ", accept-latin-extra-code"))
!              (princ "."))
!             ((eq type 3)
!              (princ " (Big5)"))
!             ((eq type 4)
!              (princ " (do conversion by CCL program)"))
!             ((eq type 5)
!              (princ " (text with random binary characters)"))
!             (t (princ ": invalid coding-system."))))
!       (princ "\nEOL type: ")
!       (let ((eol-type (coding-system-eol-type coding-system)))
!       (cond ((vectorp eol-type)
!              (princ "Automatic selection from:\n\t")
!              (princ eol-type)
!              (princ "\n"))
!             ((or (null eol-type) (eq eol-type 0)) (princ "LF\n"))
!             ((eq eol-type 1) (princ "CRLF\n"))
!             ((eq eol-type 2) (princ "CR\n"))
!             (t (princ "invalid\n"))))
        (let ((postread (coding-system-get coding-system 
'post-read-conversion)))
        (when postread
          (princ "After decoding text normally,")
***************
*** 800,812 ****
        (while categories
          (setq coding-system (symbol-value (car categories)))
          (mapcar
!          (function
!           (lambda (x)
!             (if (and (not (eq x coding-system))
!                      (coding-system-get x 'no-initial-designation)
!                      (let ((flags (coding-system-flags x)))
!                        (not (or (aref flags 10) (aref flags 11)))))
!                 (setq codings (cons x codings)))))
           (get (car categories) 'coding-systems))
          (if codings
              (let ((max-col (frame-width))
--- 797,808 ----
        (while categories
          (setq coding-system (symbol-value (car categories)))
          (mapcar
!          (lambda (x)
!            (if (and (not (eq x coding-system))
!                     (coding-system-get x 'no-initial-designation)
!                     (let ((flags (coding-system-flags x)))
!                       (not (or (aref flags 10) (aref flags 11)))))
!                (setq codings (cons x codings))))
           (get (car categories) 'coding-systems))
          (if codings
              (let ((max-col (frame-width))
***************
*** 1115,1123 ****
        ;; This code is duplicated near the end of mule-diag.
        (let ((fontsets
               (sort (fontset-list)
!                    (function (lambda (x y)
!                                (string< (fontset-plain-name x)
!                                         (fontset-plain-name y)))))))
          (while fontsets
            (if arg
                (print-fontset (car fontsets) nil)
--- 1111,1119 ----
        ;; This code is duplicated near the end of mule-diag.
        (let ((fontsets
               (sort (fontset-list)
!                    (lambda (x y)
!                      (string< (fontset-plain-name x)
!                               (fontset-plain-name y))))))
          (while fontsets
            (if arg
                (print-fontset (car fontsets) nil)
***************
*** 1128,1134 ****
  (defun list-input-methods ()
    "Display information about all input methods."
    (interactive)
!   (with-output-to-temp-buffer "*Help*"
      (list-input-methods-1)
      (with-current-buffer standard-output
        (save-excursion
--- 1124,1131 ----
  (defun list-input-methods ()
    "Display information about all input methods."
    (interactive)
!   (help-setup-xref '(list-input-methods) (interactive-p))
!   (with-output-to-temp-buffer (help-buffer)
      (list-input-methods-1)
      (with-current-buffer standard-output
        (save-excursion
***************
*** 1137,1144 ****
                "^  \\([^ ]+\\) (`.*' in mode line)$" nil t)
          (help-xref-button 1 #'help-input-method
                                (match-string 1)
!                               "mouse-2: describe this method")))
!       (help-setup-xref '(list-input-methods) (interactive-p)))))
  
  (defun list-input-methods-1 ()
    (if (not input-method-alist)
--- 1134,1140 ----
                "^  \\([^ ]+\\) (`.*' in mode line)$" nil t)
          (help-xref-button 1 #'help-input-method
                                (match-string 1)
!                               "mouse-2: describe this method"))))))
  
  (defun list-input-methods-1 ()
    (if (not input-method-alist)
***************
*** 1150,1156 ****
      (princ "    SHORT-DESCRIPTION\n------------------------------\n")
      (setq input-method-alist
          (sort input-method-alist
!               (function (lambda (x y) (string< (nth 1 x) (nth 1 y))))))
      (let ((l input-method-alist)
          language elt)
        (while l
--- 1146,1152 ----
      (princ "    SHORT-DESCRIPTION\n------------------------------\n")
      (setq input-method-alist
          (sort input-method-alist
!               (lambda (x y) (string< (nth 1 x) (nth 1 y)))))
      (let ((l input-method-alist)
          language elt)
        (while l