diff options
Diffstat (limited to 'lisp/international/mule-cmds.el')
| -rw-r--r-- | lisp/international/mule-cmds.el | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 29b2218ae54..5f4d3ea849e 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1,7 +1,6 @@ ;;; mule-cmds.el --- commands for multilingual environment -*-coding: iso-2022-7bit -*- -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1997-2011 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) @@ -140,7 +139,7 @@ (define-key-after map [describe-language-environment] `(menu-item ,(purecopy "Describe Language Environment") - describe-language-environment-map + ,describe-language-environment-map :help ,(purecopy "Show multilingual settings for a specific language"))) (define-key-after map [describe-input-method] `(menu-item ,(purecopy "Describe Input Method...") describe-input-method @@ -286,9 +285,8 @@ wrong, use this command again to toggle back to the right mode." "Display the HELLO file, which lists many languages and characters." (interactive) ;; We have to decode the file in any environment. - (letf (((default-value 'enable-multibyte-characters) t) - (coding-system-for-read 'iso-2022-7bit)) - (view-file (expand-file-name "HELLO" data-directory)))) + (letf ((coding-system-for-read 'iso-2022-7bit)) + (view-file (expand-file-name "HELLO" data-directory)))) (defun universal-coding-system-argument (coding-system) "Execute an I/O command using the specified coding system." @@ -2038,7 +2036,7 @@ See `set-language-info-alist' for use in programs." (defun princ-list (&rest args) "Print all arguments with `princ', then print \"\\n\"." - (while args (princ (car args)) (setq args (cdr args))) + (mapc #'princ args) (princ "\n")) (make-obsolete 'princ-list "use mapc and princ instead" "23.3") @@ -2183,7 +2181,7 @@ See `set-language-info-alist' for use in programs." ("af" . "Latin-1") ; Afrikaans ("am" "Ethiopic" utf-8) ; Amharic ("an" . "Latin-9") ; Aragonese - ; ar Arabic glibc uses 8859-6 + ("ar" . "Arabic") ; as Assamese ; ay Aymara ("az" . "UTF-8") ; Azerbaijani @@ -2886,8 +2884,10 @@ on encoding." :group 'mule :global t) -(defvar nonascii-insert-offset 0 "This variable is obsolete.") -(defvar nonascii-translation-table nil "This variable is obsolete.") +(defvar nonascii-insert-offset 0) +(make-obsolete-variable 'nonascii-insert-offset "do not use it." "23.1") +(defvar nonascii-translation-table nil) +(make-obsolete-variable 'nonascii-translation-table "do not use it." "23.1") (defvar ucs-names nil "Alist of cached (CHAR-NAME . CHAR-CODE) pairs.") @@ -2897,15 +2897,19 @@ on encoding." (or ucs-names (let ((bmp-ranges '((#x0000 . #x33FF) - ;; (#x3400 . #x4DBF) CJK Ideograph Extension A + ;; (#x3400 . #x4DBF) CJK Ideographs Extension A (#x4DC0 . #x4DFF) - ;; (#x4E00 . #x9FFF) CJK Ideograph - (#xA000 . #x0D7FF) + ;; (#x4E00 . #x9FFF) CJK Unified Ideographs + (#xA000 . #xD7FF) ;; (#xD800 . #xFAFF) Surrogate/Private (#xFB00 . #xFFFD))) (upper-ranges '((#x10000 . #x134FF) - ;; (#x13500 . #x1CFFF) unused + ;; (#x13500 . #x167FF) unused + (#x16800 . #x16A3F) + ;; (#x16A40 . #x1AFFF) unused + (#x1B000 . #x1B0FF) + ;; (#x1B100 . #x1CFFF) unused (#x1D000 . #x1FFFF) ;; (#x20000 . #xDFFFF) CJK Ideograph Extension A, B, etc, unused (#xE0000 . #xE01FF))) @@ -2991,5 +2995,4 @@ properties are sticky." (define-key ctl-x-map "8\r" 'ucs-insert) -;; arch-tag: b382c432-4b36-460e-bf4c-05efd0bb18dc ;;; mule-cmds.el ends here |