From a2fd9d65445bd0ce0be437d4509c1fe10d2b61ab Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Fri, 19 Jun 2015 17:11:09 +0200 Subject: [PATCH 1/3] addons: support for URI's containing ~ and + Current word selection fails on URI's containing ~ and/or + (like launchpad PPA's). Adding ~ and + to GEANY_WORDCHARS fixes this. --- addons/src/ao_openuri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/src/ao_openuri.c b/addons/src/ao_openuri.c index 66115ec00..fa1cb4ad2 100644 --- a/addons/src/ao_openuri.c +++ b/addons/src/ao_openuri.c @@ -250,7 +250,7 @@ void ao_open_uri_update_menu(AoOpenUri *openuri, GeanyDocument *doc, gint pos) sci_get_selected_text(doc->editor->sci, text); } else - text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#="); + text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+"); /* TODO be more restrictive when handling selections as there are too many hits by now */ if (text != NULL && (ao_uri_has_scheme(text) || ao_uri_is_link(text))) From 58f92161c11cff7ba6e0681593fd34a89c9dcc53 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Mon, 22 Jun 2015 17:40:40 +0200 Subject: [PATCH 2/3] addons: further improve RFC 3986 compliancy for URI selection --- addons/src/ao_openuri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/src/ao_openuri.c b/addons/src/ao_openuri.c index fa1cb4ad2..cfe22ba21 100644 --- a/addons/src/ao_openuri.c +++ b/addons/src/ao_openuri.c @@ -250,7 +250,7 @@ void ao_open_uri_update_menu(AoOpenUri *openuri, GeanyDocument *doc, gint pos) sci_get_selected_text(doc->editor->sci, text); } else - text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+"); + text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+_&,;"); /* TODO be more restrictive when handling selections as there are too many hits by now */ if (text != NULL && (ao_uri_has_scheme(text) || ao_uri_is_link(text))) From cdaaff6e936217788fc65ee6ce0d16a7276bc3e8 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Tue, 23 Jun 2015 07:31:40 +0200 Subject: [PATCH 3/3] addons: fixed double & entree in GEANY_WORDCHARS --- addons/src/ao_openuri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/src/ao_openuri.c b/addons/src/ao_openuri.c index cfe22ba21..85b9ae440 100644 --- a/addons/src/ao_openuri.c +++ b/addons/src/ao_openuri.c @@ -250,7 +250,7 @@ void ao_open_uri_update_menu(AoOpenUri *openuri, GeanyDocument *doc, gint pos) sci_get_selected_text(doc->editor->sci, text); } else - text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+_&,;"); + text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+_,;"); /* TODO be more restrictive when handling selections as there are too many hits by now */ if (text != NULL && (ao_uri_has_scheme(text) || ao_uri_is_link(text)))