3 files changed, 13 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8af8ba4d076..e4ed37cf9cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * international/mule-cmds.el (nonascii-insert-offset)
+        (nonascii-translation-table): Add obsolescence information.
+
+        * international/mule.el (make-translation-table-from-vector): Doc fix.
+
 2010-06-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
         vc-log-incoming/vc-log-outgoing improvements for Git.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index d97320da861..42066a4d699 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -287,7 +287,7 @@ wrong, use this command again to toggle back to the right mode."
   (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 @@ 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.")
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index a89eaf4a753..0569ca4c268 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2188,8 +2188,7 @@ character, say TO-ALT, FROM is also translated to TO-ALT."
 (defun make-translation-table-from-vector (vec)
   "Make translation table from decoding vector VEC.
 VEC is an array of 256 elements to map unibyte codes to multibyte
-characters.  Elements may be nil for undefined code points.
-See also the variable `nonascii-translation-table'."
+characters.  Elements may be nil for undefined code points."
   (let ((table (make-char-table 'translation-table))
         (rev-table (make-char-table 'translation-table))
         ch)