diff -r -u -p lib/TWiki/Plugins.old/EditRowPlugin/TableCell.pm lib/TWiki/Plugins/EditRowPlugin/TableCell.pm
--- lib/TWiki/Plugins.old/EditRowPlugin/TableCell.pm	2007-03-12 19:36:52.000000000 +0000
+++ lib/TWiki/Plugins/EditRowPlugin/TableCell.pm	2007-03-13 11:12:05.000000000 +0000
@@ -114,7 +114,8 @@ sub renderForEdit {
         $text .= CGI::textarea({
             rows => $rows,
             cols => $cols,
-            name => $cellName }, $this->{text});
+            name => $cellName, 
+            default => $this->{text}});
 
     } elsif( $colDef->{type} eq 'date' ) {
 
diff -r -u -p lib/TWiki/Plugins.old/EditRowPlugin/Table.pm lib/TWiki/Plugins/EditRowPlugin/Table.pm
--- lib/TWiki/Plugins.old/EditRowPlugin/Table.pm	2007-03-12 19:36:52.000000000 +0000
+++ lib/TWiki/Plugins/EditRowPlugin/Table.pm	2007-03-13 11:36:15.000000000 +0000
@@ -16,8 +16,8 @@ sub parseTables {
     my $nTables = 0;
 
     foreach my $line (split(/\r?\n/, $_[0])) {
-        if ($line =~ /%EDITTABLE{(.*?)}%/) {
-            my $attrs = new TWiki::Attrs($1);
+        if ($line =~ /%EDIT(TABLE|ROW){(.*?)}%/) {
+            my $attrs = new TWiki::Attrs($2);
 
             if ($attrs->{include}) {
                 my( $iw, $it ) = TWiki::Func::normalizeWebTopicName(
@@ -29,8 +29,8 @@ sub parseTables {
                         "Could not find format topic $attrs->{include}");
                 }
                 my ($meta, $text) = TWiki::Func::readTopic($iw, $it);
-                $text =~ m/%EDITTABLE{([^\n]*)}%/s;
-                $attrs = new TWiki::Attrs($1);
+                $text =~ m/%EDIT(TABLE|ROW){([^\n]*)}%/s;
+                $attrs = new TWiki::Attrs($2);
             }
             $active_table =
               new TWiki::Plugins::EditRowPlugin::Table(
@@ -84,7 +84,7 @@ sub finish {
 
 sub stringify {
     my $this = shift;
-    my $s = '%EDITTABLE{'.$this->{attrs}->stringify()."}%\n";
+    my $s = '%EDITROW{'.$this->{attrs}->stringify()."}%\n";
     foreach my $row (@{$this->{rows}}) {
         $s .= $row->stringify()."\n";
     }
diff -r -u -p lib/TWiki/Plugins.old/EditRowPlugin/TableRow.pm lib/TWiki/Plugins/EditRowPlugin/TableRow.pm
--- lib/TWiki/Plugins.old/EditRowPlugin/TableRow.pm	2007-03-12 19:36:52.000000000 +0000
+++ lib/TWiki/Plugins/EditRowPlugin/TableRow.pm	2007-03-13 11:29:17.000000000 +0000
@@ -65,6 +65,8 @@ sub renderForEdit {
             }, '');
         }
     }
+    # add an anchor target
+    $buttons .= '<a name="editingrow">';
     unshift(@out, $buttons);
 
     return '| ' . join(' | ', @out) . '|';
@@ -90,7 +92,7 @@ sub renderForDisplay {
             active_table => $this->{table}->{number},
             active_row => $this->{number});
         unshift(@out,
-             "<a href='$url'>".
+             "<a href='$url#editingrow'>".
                CGI::image_button(
                    -name => 'editrowplugin_edit',
                    -src => '%PUBURLPATH%/TWiki/TWikiDocGraphics/edittopic.gif').
diff -r -u -p lib/TWiki/Plugins.old/EditRowPlugin.pm lib/TWiki/Plugins/EditRowPlugin.pm
--- lib/TWiki/Plugins.old/EditRowPlugin.pm	2007-03-12 19:36:52.000000000 +0000
+++ lib/TWiki/Plugins/EditRowPlugin.pm	2007-03-13 11:42:38.000000000 +0000
@@ -122,10 +122,10 @@ sub save {
 sub commonTagsHandler {
     # my ( $text, $topic, $web ) = @_;
 
+    # process if table row edit is switched on with the page containing an edittable. Also progress if there is an editrow
+    # no matter what the row edit switch is set to
     return unless
-      TWiki::Func::getPreferencesValue('ENABLE_TABLE_ROW_EDIT');
-
-    return unless $_[0] =~ /%EDITTABLE{(.*?)}%/;
+      (TWiki::Func::getPreferencesValue('ENABLE_TABLE_ROW_EDIT') && $_[0] =~ /%EDITTABLE{(.*?)}%/) || $_[0] =~ /%EDITROW{(.*?)}%/;
 
     my ($topic, $web) = ($_[1], $_[2]);