--- a/src/buffer.c	Mon Aug 13 10:07:42 2007 +0200
+++ b/src/buffer.c	Mon Aug 13 10:08:34 2007 +0200
@@ -216,11 +216,6 @@
                                mark_buffer, print_buffer, 0, 0, 0,
 			       struct buffer);
 
-#ifdef ENERGIZE
-extern void mark_energize_buffer_data (struct buffer *b,
-				       void (*markobj) (Lisp_Object));
-#endif
-
 Lisp_Object
 make_buffer (struct buffer *buf)
 {
@@ -243,10 +238,6 @@
 #include "bufslots.h"
 #undef MARKED_SLOT
 
-#ifdef ENERGIZE
-  mark_energize_buffer_data (XBUFFER (obj), markobj);
-#endif
-
   ((markobj) (buf->extent_info));
 
   /* Don't mark normally through the children slot.
@@ -959,12 +950,6 @@
   /* This function can GC */
   struct buffer *buf = decode_buffer (buffer, 0);
 
-#ifdef ENERGIZE
-  Lisp_Object starting_flag =
-    (BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf)) ? Qt : Qnil;
-  Lisp_Object argument_flag = (NILP (flag)) ? Qnil : Qt;
-#endif
-
 #ifdef CLASH_DETECTION
   /* If buffer becoming modified, lock the file.
      If buffer becoming unmodified, unlock the file.  */
@@ -1000,22 +985,6 @@
   BUF_SAVE_MODIFF (buf) = NILP (flag) ? BUF_MODIFF (buf) : 0;
   MARK_MODELINE_CHANGED;
 
-#ifdef ENERGIZE
-  /* don't send any notification if we are "setting" the modification bit
-     to be the same as it already was */
-  if (!EQ (starting_flag, argument_flag))
-    {
-      extern Lisp_Object Qenergize_buffer_modified_hook;
-      int count = specpdl_depth ();
-      record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
-      set_buffer_internal (buf);
-      va_run_hook_with_args (Qenergize_buffer_modified_hook, 3,
-			     flag, make_int (BUF_BEG (buf)),
-			     make_int (BUF_Z (buf)));
-      unbind_to (count, Qnil);
-    }
-#endif /* ENERGIZE */
-
   return flag;
 }