--- rxvt-unicode/src/keyboard.C	2008/01/10 11:30:45	1.30
+++ rxvt-unicode/src/keyboard.C	2010/07/26 09:57:53	1.33
@@ -54,7 +54,7 @@
  * it is computed from hash_budget_size[]:
  * index: 0      I1         I2         I3             In
  * value: 0...0, N1, 0...0, N2, 0...0, N3,    ...,    Nn, 0...0
- *        0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the compution of hash[])
+ *        0...0, 0.......0, N1.....N1, N1+N2...N1+N2, ... (the computation of hash[])
  * or we can say
  * hash_budget_size[Ii] = Ni; hash_budget_size[elsewhere] = 0,
  * where
@@ -145,12 +145,12 @@
 compare_priority (keysym_t *a, keysym_t *b)
 {
   // (the more '1's in state; the less range): the greater priority
-  int ca = popcount (a->state /* & OtherModMask */);
-  int cb = popcount (b->state /* & OtherModMask */);
+  int ca = rxvt_popcount (a->state /* & OtherModMask */);
+  int cb = rxvt_popcount (b->state /* & OtherModMask */);
 
   if (ca != cb)
     return ca - cb;
-//else if (a->state != b->state) // this behavior is to be disscussed
+//else if (a->state != b->state) // this behavior is to be discussed
 //  return b->state - a->state;
   else
     return b->range - a->range;
@@ -428,7 +428,7 @@
 
   keymap.swap (sorted_keymap);
 
-#ifdef DEBUG_STRICT
+#ifndef NDEBUG
   // check for invariants
   for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
     {