[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/international/mule-diag.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/international/mule-diag.el [lexbind] |
Date: |
Tue, 14 Oct 2003 19:39:31 -0400 |
Index: emacs/lisp/international/mule-diag.el
diff -c emacs/lisp/international/mule-diag.el:1.74.2.1
emacs/lisp/international/mule-diag.el:1.74.2.2
*** emacs/lisp/international/mule-diag.el:1.74.2.1 Fri Apr 4 01:20:22 2003
--- emacs/lisp/international/mule-diag.el Tue Oct 14 19:39:23 2003
***************
*** 61,67 ****
'help-function #'list-charset-chars
'help-echo "mouse-2, RET: show table of characters for this character set")
! (defvar non-iso-charset-alist
`((mac-roman
(ascii latin-iso8859-1 mule-unicode-2500-33ff
mule-unicode-0100-24ff mule-unicode-e000-ffff)
--- 61,68 ----
'help-function #'list-charset-chars
'help-echo "mouse-2, RET: show table of characters for this character set")
! ;;;###autoload
! (defvar non-iso-charset-alist
`((mac-roman
(ascii latin-iso8859-1 mule-unicode-2500-33ff
mule-unicode-0100-24ff mule-unicode-e000-ffff)
***************
*** 349,375 ****
(string-to-char
(decode-coding-string (char-to-string code) coding-system))))
-
- ;; Add DOS codepages to `non-iso-charset-alist'.
-
- (let ((tail (cp-supported-codepages))
- elt)
- (while tail
- (setq elt (car tail) tail (cdr tail))
- ;; Now ELT is (CODEPAGE . CHARSET), where CODEPAGE is a string
- ;; (e.g. "850"), CHARSET is a charset that characters in CODEPAGE
- ;; are mapped to.
- (unless (assq (intern (concat "cp" (car elt))) non-iso-charset-alist)
- (setq non-iso-charset-alist
- (cons (list (intern (concat "cp" (car elt)))
- (list 'ascii (cdr elt))
- `(lambda (code)
- (decode-codepage-char ,(string-to-int (car elt))
- code))
- (list (list 0 255)))
- non-iso-charset-alist)))))
-
-
;; A variable to hold charset input history.
(defvar charset-history nil)
--- 350,355 ----
***************
*** 593,602 ****
charset (charset-description charset)))
((listp charset)
(if (charsetp (car charset))
! (format "%s:%s, and also used by the followings:"
(car charset)
(charset-description (car charset)))
! "no initial designation, and used by the followings:"))
(t
"invalid designation information"))))
(when (listp charset)
--- 573,582 ----
charset (charset-description charset)))
((listp charset)
(if (charsetp (car charset))
! (format "%s:%s, and also used by the following:"
(car charset)
(charset-description (car charset)))
! "no initial designation, and used by the following:"))
(t
"invalid designation information"))))
(when (listp charset)
***************
*** 760,765 ****
--- 740,749 ----
)))
;; Print symbol name and mnemonic letter of CODING-SYSTEM with `princ'.
+ ;; If DOC-STRING is non-nil, print also the docstring of CODING-SYSTEM.
+ ;; If DOC-STRING is `tightly', don't print an empty line before the
+ ;; docstring, and print only the first line of the docstring.
+
(defun print-coding-system-briefly (coding-system &optional doc-string)
(if (not coding-system)
(princ "nil\n")
***************
*** 780,789 ****
(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)))
! (princ (format "%s\n" doc-string)))))
;;;###autoload
(defun describe-current-coding-system ()
--- 764,779 ----
(not (eq coding-system (aref base-eol-type eol-type))))
(princ (format " (alias of %s)"
(aref base-eol-type eol-type))))))))
! (princ "\n")
! (or (eq doc-string 'tightly)
! (princ "\n"))
! (if doc-string
! (let ((doc (or (coding-system-doc-string coding-system) "")))
! (when (eq doc-string 'tightly)
! (if (string-match "\n" doc)
! (setq doc (substring doc 0 (match-beginning 0))))
! (setq doc (concat " " doc)))
! (princ (format "%s\n" doc))))))
;;;###autoload
(defun describe-current-coding-system ()
***************
*** 976,982 ****
###############################################
# List of coding systems in the following format:
# MNEMONIC-LETTER -- CODING-SYSTEM-NAME
! # DOC-STRING
")
(princ "\
#########################
--- 966,972 ----
###############################################
# List of coding systems in the following format:
# MNEMONIC-LETTER -- CODING-SYSTEM-NAME
! # DOC-STRING
")
(princ "\
#########################
***************
*** 993,999 ****
## EOL = 0 (LF), 1 (CRLF), 2 (CR), or 3 (Automatic detection)
## FLAGS =
## if TYPE = 2 then
! ## comma (`,') separated data of the followings:
## G0, G1, G2, G3, SHORT-FORM, ASCII-EOL, ASCII-CNTL, SEVEN,
## LOCKING-SHIFT, SINGLE-SHIFT, USE-ROMAN, USE-OLDJIS, NO-ISO6429
## else if TYPE = 4 then
--- 983,989 ----
## EOL = 0 (LF), 1 (CRLF), 2 (CR), or 3 (Automatic detection)
## FLAGS =
## if TYPE = 2 then
! ## comma (`,') separated data of the following:
## G0, G1, G2, G3, SHORT-FORM, ASCII-EOL, ASCII-CNTL, SEVEN,
## LOCKING-SHIFT, SINGLE-SHIFT, USE-ROMAN, USE-OLDJIS, NO-ISO6429
## else if TYPE = 4 then
***************
*** 1003,1016 ****
## POST-READ-CONVERSION, PRE-WRITE-CONVERSION = function name to be called
##
"))
! (let ((bases (coding-system-list 'base-only))
! coding-system)
! (while bases
! (setq coding-system (car bases))
! (if (null arg)
! (print-coding-system-briefly coding-system 'doc-string)
! (print-coding-system coding-system))
! (setq bases (cdr bases)))))
;;;###autoload
(defun list-coding-categories ()
--- 993,1013 ----
## POST-READ-CONVERSION, PRE-WRITE-CONVERSION = function name to be called
##
"))
! (dolist (coding-system (sort-coding-systems (coding-system-list
'base-only)))
! (if (null arg)
! (print-coding-system-briefly coding-system 'tightly)
! (print-coding-system coding-system)))
! (let ((first t))
! (dolist (elt coding-system-alist)
! (unless (memq (intern (car elt)) coding-system-list)
! (when first
! (princ "\
! ####################################################
! # The following coding systems are not yet loaded. #
! ####################################################
! ")
! (setq first nil))
! (princ-list (car elt))))))
;;;###autoload
(defun list-coding-categories ()
***************
*** 1312,1315 ****
--- 1309,1313 ----
(provide 'mule-diag)
+ ;;; arch-tag: cd3b607c-2893-45a0-a4fa-a6535754dbee
;;; mule-diag.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/international/mule-diag.el [lexbind],
Miles Bader <=