From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 5 Aug 1997 05:00:55 +0000 (+0000)
Subject: (standard-display-cyrillic-translit):
X-Git-Tag: emacs-20.1~790
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2631431ffc00d757104574265f2319d530439e0a;p=emacs.git

(standard-display-cyrillic-translit):
Set standard-display-table here, not when loading the file.
Read argument properly with `interactive'.
---

diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index f8291b30045..055d53a35f3 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -41,8 +41,6 @@
 	    '("Russian")  '("Ukrainian"))
       "*List of known cyrillic languages")
 
-(setq standard-display-table (make-display-table))
-
 ;;;###autoload
 (defun standard-display-cyrillic-translit (&optional cyrillic-language)
   "Display a cyrillic buffer using a transliteration.
@@ -54,13 +52,15 @@ that affects the choice of transliterations slightly.
 Possible values are listed in 'cyrillic-language-alist'.
 If the argument is t, we use the default cyrillic transliteration.
 If the argument is nil, we return the display table to its standard state."
-  (interactive)
-  (if (interactive-p)
-      (let* ((completion-ignore-case t))
-	(setq cyrillic-language 
-	      (completing-read
-	       "Cyrillic language (default nil): "
-	       cyrillic-language-alist nil t nil nil nil))))
+  (interactive
+   (list
+    (let* ((completion-ignore-case t))
+      (completing-read
+       "Cyrillic language (default nil): "
+       cyrillic-language-alist nil t nil nil nil))))
+
+  (or standard-display-table
+      (setq standard-display-table (make-display-table)))
 
   (if (equal cyrillic-language "")
       (setq cyrillic-language nil))