--- a/src/input.cc	Tue Dec 14 18:40:38 2010 -0800
+++ b/src/input.cc	Wed Dec 15 00:44:10 2010 -0500
@@ -1247,29 +1247,32 @@
 static int
 input_event_hook (void)
 {
-  hook_fcn_map_type::iterator p = hook_fcn_map.begin ();
-
-  while (p != hook_fcn_map.end ())
+  if (! lexer_flags.defining_func)
     {
-      std::string hook_fcn = p->first;
-      octave_value user_data = p->second;
+      hook_fcn_map_type::iterator p = hook_fcn_map.begin ();
 
-      p++;
-
-      if (is_valid_function (hook_fcn))
+      while (p != hook_fcn_map.end ())
         {
-          if (user_data.is_defined ())
-            feval (hook_fcn, user_data, 0);
+          std::string hook_fcn = p->first;
+          octave_value user_data = p->second;
+
+          p++;
+
+          if (is_valid_function (hook_fcn))
+            {
+              if (user_data.is_defined ())
+                feval (hook_fcn, user_data, 0);
+              else
+                feval (hook_fcn, octave_value_list (), 0);
+            }
           else
-            feval (hook_fcn, octave_value_list (), 0);
+            hook_fcn_map.erase (p);
         }
-      else
-        hook_fcn_map.erase (p);
+
+      if (hook_fcn_map.empty ())
+        command_editor::remove_event_hook (input_event_hook);
     }
 
-  if (hook_fcn_map.empty ())
-    command_editor::remove_event_hook (input_event_hook);
-
   return 0;
 }