(font-show-log): Fix previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bbb9268b7bd24a3b05b6ea242102242baed94471..b262890f0e9ebcf4804d8033e6b7f3b5e0f4da32 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2008-09-01  Kenichi Handa  <handa@m17n.org>
 
+       * international/mule-diag.el (font-show-log): Fix previous change.
+
+       * international/mule-cmds.el (set-language-environment): Don't
+       overwrite current-iso639-language if the current language
+       environment doesn't provide that data.
+       (set-locale-environment): Set current-iso639-language from the
+       locale name.
+
        * international/fontset.el (script-representative-chars): Re-add
        the entry for symbol, but with vector of characters.
        (setup-default-fontset): Cancel previous change.

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 720201b4f1ba971951de9947535e3184edac36c7..b104cefa3ac670af99c61734775bc26595f7d78b 100644 (file)
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1299,11 +1299,12 @@ character)")
                                               (nth 13 fields) 16)))))))))))
 
 ;;;###autoload
-(defun font-show-log (&optional n)
+(defun font-show-log (&optional limit)
   "Show log of font listing and opening.
-Prefix arg N says how many fonts to show for each listing.
-The default is 20.  If N is negative, do not limit the listing."
-  (interactive "p")
+Prefix arg LIMIT says how many fonts to show for each listing.
+The default is 20.  If LIMIT is negative, do not limit the listing."
+  (interactive "P")
+  (setq limit (if limit (prefix-numeric-value limit) 20))
   (if (eq font-log t)
       (message "Font logging is currently suppressed")
     (with-output-to-temp-buffer "*Help*"
@@ -1316,7 +1317,7 @@ The default is 20.  If N is negative, do not limit the listing."
              (catch 'tag
                (mapc #'(lambda (x)
                          (setq i (1+ i))
-                         (when (= i n)
+                         (when (= i limit)
                            (insert "  ...\n")
                            (throw 'tag nil))
                          (insert (format "  %s\n" x)))