--- rxvt-unicode/src/perl/selection	2006/05/20 18:17:38	1.38
+++ rxvt-unicode/src/perl/selection	2007/11/19 09:29:46	1.46
@@ -34,20 +34,31 @@
 
 # "find interesting things"-patterns
 my @mark_patterns = (
+   qr{ ([[:word:]]+) }x,
+   qr{ ([^[:space:]]+) }x,
+
    # common types of "parentheses"
-   qr{ (?<![^[:space:]]) ‘ ([^‘’]+) ’ (?![^[:space]]) }x,
-   qr{ (?<![^[:space:]]) ` ([^`']+) ' (?![^[:space]]) }x,
+   qr{ (?<![^[:space:]])  ` ([^‘’]+)  ` (?![^[:space:]]) }x,
+   qr{ (?<![^[:space:]])  ‘ ([^‘’]+)  ’ (?![^[:space:]]) }x,
+   qr{ (?<![^[:space:]])  ` ([^`']+)  ' (?![^[:space:]]) }x,
+
+   qr{ (?<![^[:space:]])  ‘ ([^`']+)  ’ (?![^[:space:]]) }x,
+   qr{ (?<![^[:space:]])  “ ([^`']+)  ” (?![^[:space:]]) }x,
+
+   qr{ (?<![^[:space:]]) (' [^[:space:]] [^']* ')                 }x,
+   qr{                   (' [^']* [^[:space:]] ') (?![^[:space:]]) }x,
    qr{ (?<![^[:space:]]) (" [^[:space:]] [^"]* ")                 }x,
-   qr{                   (" [^"]* [^[:space:]] ") (?![^[:space]]) }x,
-   qr{ \< ([^<>[:space:]]+) \> }x,
-   qr{ \{ ([^{}[:space:]]+) \} }x,
-   qr{ \[ ([^{}[:space:]]+) \] }x,
-   qr{ \( ([^()[:space:]]+) \) }x,
+   qr{                   (" [^"]* [^[:space:]] ") (?![^[:space:]]) }x,
+
+   qr{ \< ([^\>]+) \> }x,
+   qr{ \( ([^\)]+) \) }x,
+   qr{ \{ ([^\}]+) \} }x,
+   qr{ \[ ([^\]]+) \] }x,
 
    # urls, just a heuristic
    qr{(
-      (?:https?://|ftp://|news://|mailto:|file://)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
-      [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
+      (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~#]+
+      [ab-zA-Z0-9\-\@;\/?:&=%\$_+*()~]   # exclude some trailing characters (heuristic)
    )}x,
 
    # shell-like argument quoting, basically always matches
@@ -83,7 +94,7 @@
    my @matches;
 
    if ($markofs < $line->l) {
-      # convert markofs form character to UTF-8 offset space
+      # convert markofs from character to UTF-8 offset space
       {
          my $prefix = substr $text, 0, $markofs;
          utf8::encode $prefix;