Mercurial > emacs
diff lisp/international/mule-cmds.el @ 108902:1f795f817d05
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 06 Jun 2010 22:46:17 +0000 |
| parents | 0ed39249e8e4 |
| children | 1897051f6da3 |
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el Thu Jun 03 23:18:01 2010 +0000 +++ b/lisp/international/mule-cmds.el Sun Jun 06 22:46:17 2010 +0000 @@ -287,7 +287,7 @@ (interactive) ;; We have to decode the file in any environment. (letf ((coding-system-for-read 'iso-2022-7bit)) - (view-file (expand-file-name "HELLO" data-directory)))) + (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." @@ -2882,8 +2882,10 @@ :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.")