aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2008-08-18 12:04:35 +0000
committerKenichi Handa2008-08-18 12:04:35 +0000
commit4ab088c087da03de9f6878e8548d46f754b968a6 (patch)
tree33e93385d59f2f7dc6f3a638b8d9883ab4708850
parenta971635315e259c076de020b3676c04d1dcc415e (diff)
downloademacs-4ab088c087da03de9f6878e8548d46f754b968a6.tar.gz
emacs-4ab088c087da03de9f6878e8548d46f754b968a6.zip
(font-show-log): Add optional arg N to control the limit of font
listing.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-diag.el13
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 517e6e71d10..e8285640541 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-08-18 Kenichi Handa <handa@m17n.org>
2
3 * international/mule-diag.el (font-show-log): Add optional arg N
4 to control the limit of font listing.
5
12008-08-18 Chong Yidong <cyd@stupidchicken.com> 62008-08-18 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * window.el (recenter-top-bottom): Determine top and bottom 8 * window.el (recenter-top-bottom): Determine top and bottom
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 93571846345..720201b4f1b 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1299,9 +1299,11 @@ character)")
1299 (nth 13 fields) 16))))))))))) 1299 (nth 13 fields) 16)))))))))))
1300 1300
1301;;;###autoload 1301;;;###autoload
1302(defun font-show-log () 1302(defun font-show-log (&optional n)
1303 "Show log of font listing and opening." 1303 "Show log of font listing and opening.
1304 (interactive) 1304Prefix arg N says how many fonts to show for each listing.
1305The default is 20. If N is negative, do not limit the listing."
1306 (interactive "p")
1305 (if (eq font-log t) 1307 (if (eq font-log t)
1306 (message "Font logging is currently suppressed") 1308 (message "Font logging is currently suppressed")
1307 (with-output-to-temp-buffer "*Help*" 1309 (with-output-to-temp-buffer "*Help*"
@@ -1310,12 +1312,11 @@ character)")
1310 (insert (format "%s: %s\n" (car elt) (cadr elt))) 1312 (insert (format "%s: %s\n" (car elt) (cadr elt)))
1311 (setq elt (nth 2 elt)) 1313 (setq elt (nth 2 elt))
1312 (if (or (vectorp elt) (listp elt)) 1314 (if (or (vectorp elt) (listp elt))
1313 (let ((limit 20) 1315 (let ((i 0))
1314 (i 0))
1315 (catch 'tag 1316 (catch 'tag
1316 (mapc #'(lambda (x) 1317 (mapc #'(lambda (x)
1317 (setq i (1+ i)) 1318 (setq i (1+ i))
1318 (when (= i 20) 1319 (when (= i n)
1319 (insert " ...\n") 1320 (insert " ...\n")
1320 (throw 'tag nil)) 1321 (throw 'tag nil))
1321 (insert (format " %s\n" x))) 1322 (insert (format " %s\n" x)))