Merge branch 'master' into scrollback-completion

This commit is contained in:
Daniel Micay 2012-06-04 10:41:34 -04:00
commit 98aae37d2e
1 changed files with 2 additions and 1 deletions

View File

@ -5,8 +5,9 @@
#define CLICKABLE_URL #define CLICKABLE_URL
//#define ICON_NAME "terminal" //#define ICON_NAME "terminal"
#ifdef CLICKABLE_URL
static const char *url_regex = "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+]*"; static const char *url_regex = "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+]*";
#ifdef CLICKABLE_URL
#define URL_COMMAND(URL_MATCH) {"/usr/bin/firefox", URL_MATCH, NULL} #define URL_COMMAND(URL_MATCH) {"/usr/bin/firefox", URL_MATCH, NULL}
#endif #endif