aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-06-13 09:18:59 -0400
committerStefan Monnier2012-06-13 09:18:59 -0400
commitef62b23df5a7007c3d8c74dbca87ba83e9da682e (patch)
treeaf017a0513689caeb1abd050fdd2de2174eb0423
parentc4c8444a78a7a292331ee9eb6dc1f535f05e6c15 (diff)
downloademacs-ef62b23df5a7007c3d8c74dbca87ba83e9da682e.tar.gz
emacs-ef62b23df5a7007c3d8c74dbca87ba83e9da682e.zip
* lisp/loadup.el: Count byte-code functions as well.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/loadup.el6
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 920c9efb874..d9d75c8d091 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-06-13 Stefan Monnier <monnier@iro.umontreal.ca> 12012-06-13 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * loadup.el: Count byte-code functions as well.
4
3 * emacs-lisp/byte-opt.el (featurep): Move compiler-macro... 5 * emacs-lisp/byte-opt.el (featurep): Move compiler-macro...
4 * emacs-lisp/bytecomp.el (featurep): ...here (bug#11692). 6 * emacs-lisp/bytecomp.el (featurep): ...here (bug#11692).
5 7
diff --git a/lisp/loadup.el b/lisp/loadup.el
index fae742f6638..3b2d4e34938 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -321,6 +321,7 @@
321(when (hash-table-p purify-flag) 321(when (hash-table-p purify-flag)
322 (let ((strings 0) 322 (let ((strings 0)
323 (vectors 0) 323 (vectors 0)
324 (bytecodes 0)
324 (conses 0) 325 (conses 0)
325 (others 0)) 326 (others 0))
326 (maphash (lambda (k v) 327 (maphash (lambda (k v)
@@ -328,10 +329,11 @@
328 ((stringp k) (setq strings (1+ strings))) 329 ((stringp k) (setq strings (1+ strings)))
329 ((vectorp k) (setq vectors (1+ vectors))) 330 ((vectorp k) (setq vectors (1+ vectors)))
330 ((consp k) (setq conses (1+ conses))) 331 ((consp k) (setq conses (1+ conses)))
332 ((byte-code-function-p v) (setq bytecodes (1+ bytecodes)))
331 (t (setq others (1+ others))))) 333 (t (setq others (1+ others)))))
332 purify-flag) 334 purify-flag)
333 (message "Pure-hashed: %d strings, %d vectors, %d conses, %d others" 335 (message "Pure-hashed: %d strings, %d vectors, %d conses, %d bytecodes, %d others"
334 strings vectors conses others))) 336 strings vectors conses bytecodes others)))
335 337
336;; Avoid error if user loads some more libraries now and make sure the 338;; Avoid error if user loads some more libraries now and make sure the
337;; hash-consing hash table is GC'd. 339;; hash-consing hash table is GC'd.