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

2 files changed, 14 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bbb9268b7b..b262890f0e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2008-09-01  Kenichi Handa  <[email protected]>
 
+	* 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 720201b4f1..b104cefa3a 100644
--- 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)))