takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into config-file 

Conflicts:
	config.h
This commit is contained in:
Daniel Micay 2012-06-07 16:40:18 -04:00
parent 83e8399111 1a0dda746d
commit ca2f60b977
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -21,7 +21,7 @@ KEYBINDINGS
* ``ctrl-shift-p``: jump to previous search match * ``ctrl-shift-p``: jump to previous search match
* ``ctrl-tab``: start scrollback completion * ``ctrl-tab``: start scrollback completion
During scrollback search, The current selection is changed to the search match During scrollback search, the current selection is changed to the search match
and copied to the PRIMARY clipboard buffer. and copied to the PRIMARY clipboard buffer.
With the scrollback completion/widget open, up/down cycle through completions, With the scrollback completion/widget open, up/down cycle through completions,

2
config.h
View File

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

2
termite.c
View File

@ -48,7 +48,7 @@ static GtkTreeModel *create_completion_model(VteTerminal *vte) {
NULL, NULL, NULL); NULL, NULL, NULL);
if (!content) { if (!content) {
g_printerr("no content returned for completion"); g_printerr("no content returned for completion\n");
return GTK_TREE_MODEL(store); return GTK_TREE_MODEL(store);
} }