Revert change to 'renaming' output

Author: sethrj

Examples/test-suite/errors/c_class.stderr

@@ -1,2 +1,2 @@
 c_class.i:3: Warning 301: class keyword used, but not in C++ mode.
-c_class.i:3: Warning 314: 'class' is a python keyword: renaming 'class' to '_class'
+c_class.i:3: Warning 314: 'class' is a python keyword, renaming to '_class'

Source/Swig/naming.c

@@ -1274,7 +1274,7 @@ static Hash *name_nameobj_lget(List *namelist, Node *n, String *prefix, String *
  * ----------------------------------------------------------------------------- */
 
 void Swig_name_namewarn_add(String *prefix, String *name, SwigType *decl, Hash *namewrn) {
-  const char *namewrn_keys[] = { "rename", "error", "fullname", "sourcefmt", "targetfmt", "regextarget", 0 };
+  const char *namewrn_keys[] = { "rename", "error", "fullname", "sourcefmt", "targetfmt", 0 };
   name_object_attach_keys(namewrn_keys, namewrn);
   name_nameobj_add(name_namewarn_hash(), name_namewarn_list(), prefix, name, decl, namewrn);
 }
@@ -1392,7 +1392,7 @@ static String *apply_rename(Node* n, String *newname, int fullname, String *pref
       /* $ignore doesn't apply to parameters and while it's rare to explicitly write %ignore directives for them they could be caught by a wildcard ignore using
          regex match, just ignore the attempt to ignore them in this case */
       if (!Equal(nodeType(n), "parm"))
-      result = Copy(newname);
+	result = Copy(newname);
     } else {
       char *cnewname = Char(newname);
       if (cnewname) {
@@ -1521,7 +1521,7 @@ String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname,
 	    if (Strcmp(result, "$ignore") == 0) {
 	      suffix = NewStringf(": ignoring '%s'\n", name);
 	    } else if (Strcmp(result, name) != 0) {
-	      suffix = NewStringf(": renaming '%s' to '%s'\n", name, result);
+	      suffix = NewStringf(", renaming to '%s'\n", result);
 	    } else {
 	      /* No rename was performed */
 	      suffix = NewString("\n");