Get rid of all the manual purecopy calls in menu-bar definitions.

* lisp/loadup.el (purify-flag): Pre-grow the hash-table to reduce the
memory use.
* lisp/bindings.el (bindings--define-key): New function.
* lisp/vc/vc-hooks.el, lisp/replace.el, lisp/menu-bar.el:
* lisp/international/mule-cmds.el, lisp/emacs-lisp/lisp-mode.el:
* lisp/buff-menu.el, lisp/bookmark.el:
* bindings.el: Use it to purecopy define-key bindings.
* src/fns.c (maybe_resize_hash_table): Output message when growing the
purify-hashtable.

4 files changed, 21 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc70a99a170..9af61d41353 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fns.c (maybe_resize_hash_table): Output message when growing the
+        purify-hashtable.
+
 2012-06-27  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * alloc.c (allocate_string_data): Remove dead code.
@@ -29,7 +34,7 @@
 
 2012-06-26  John Wiegley  <johnw@newartisans.com>
 
-        * unexmacosx.c (copy_data_segment): Added two section names used
+        * unexmacosx.c (copy_data_segment): Add two section names used
         on Mac OS X Lion: __mod_init_func and __mod_term_func.
 
         * alloc.c (mark_memory): Do not check with -faddress-sanitizer
diff --git a/src/data.c b/src/data.c
index bd757cfdad1..fe7b9420344 100644
--- a/src/data.c
+++ b/src/data.c
@@ -517,7 +517,7 @@ DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0,
   return newcdr;
 }
 
-/* Extract and set components of symbols */
+/* Extract and set components of symbols.  */
 
 DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
        doc: /* Return t if SYMBOL's value is not void.  */)
diff --git a/src/fns.c b/src/fns.c
index 515cd28328b..f734520fedb 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3749,6 +3749,17 @@ maybe_resize_hash_table (struct Lisp_Hash_Table *h)
       if (INDEX_SIZE_BOUND < nsize)
         error ("Hash table too large to resize");
 
+#ifdef ENABLE_CHECKING
+      if (HASH_TABLE_P (Vpurify_flag)
+          && XHASH_TABLE (Vpurify_flag) == h)
+        {
+          Lisp_Object args[2];
+          args[0] = build_string ("Growing hash table to: %d");
+          args[1] = make_number (new_size);
+          Fmessage (2, args);
+        }
+#endif
+
       h->key_and_value = larger_vector (h->key_and_value,
                                         2 * (new_size - old_size), -1);
       h->next = larger_vector (h->next, new_size - old_size, -1);
diff --git a/src/puresize.h b/src/puresize.h
index 7f8f279f568..2f024345d61 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -47,9 +47,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef PURESIZE_RATIO
 #if EMACS_INT_MAX >> 31 != 0
 #if PTRDIFF_MAX >> 31 != 0
-#define PURESIZE_RATIO 10/6     /* Don't surround with `()'. */
+#define PURESIZE_RATIO 10 / 6   /* Don't surround with `()'.  */
 #else
-#define PURESIZE_RATIO 8/6      /* Don't surround with `()'. */
+#define PURESIZE_RATIO 8 / 6    /* Don't surround with `()'.  */
 #endif
 #else
 #define PURESIZE_RATIO 1
@@ -60,7 +60,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* ENABLE_CHECKING somehow increases the purespace used, probably because
    it tends to cause some macro arguments to be evaluated twice.  This is
    a bug, but it's difficult to track it down.  */
-#define PURESIZE_CHECKING_RATIO 12/10   /* Don't surround with `()'. */
+#define PURESIZE_CHECKING_RATIO 12 / 10 /* Don't surround with `()'.  */
 #else
 #define PURESIZE_CHECKING_RATIO 1
 #endif