[gtk-doc] Be more conservative in parsing email addresses

[William Jon McCann <mccann src gnome org>]

commit a787aa5c47bcda42f68b8a9d6641caa3716918aa
Author: William Jon McCann <william jon mccann gmail com>
Date:   Wed Feb 5 16:09:09 2014 -0500

    Be more conservative in parsing email addresses

 gtkdoc-mkdb.in              |    2 +-
 tests/gobject/src/gobject.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 35a8cf5..4f22d41 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -4995,7 +4995,7 @@ sub MarkDownParseSpanElementsInner {
 
         $markup .= "<ulink url=\"" . $element_url . "\">" . $element_url . "</ulink>";
         $offset = length ($&);
-      } elsif ($text =~ /^<(\S+? \S+?)>/) {
+      } elsif ($text =~ /^<([A-Za-z0-9 _-]+? [A-Za-z0-9 _-]+?)>/) {
         $markup .= "<ulink url=\"mailto:"; . $1 . "\">" . $1 . "</a>";
         $offset = length ($&);
       } elsif ($text =~ /^<[^>]+?>/) {
diff --git a/tests/gobject/src/gobject.c b/tests/gobject/src/gobject.c
index 04e3b9d..1cfd4a4 100644
--- a/tests/gobject/src/gobject.c
+++ b/tests/gobject/src/gobject.c
@@ -15,6 +15,8 @@
  * 0 is a Sunday).  Times are in local wall clock time, the default is
  * 02:00:00.
  *
+ * <literal>lang_COUNTRY MODIFIER</literal>
+ *
  * This file contains non-sense code for the sole purpose of testing the docs.
  * We can link to the #GtkdocObject:otest property and the #GtkdocObject::otest
  * signal.