Merge remote-tracking branch 'upstream/master' into termlets

Author: lwandrebeck

src/FinalTerm.vala

@@ -158,6 +158,7 @@ public class FinalTerm : Gtk.Application {
 				"Martin Middel <[email protected]>",
 				"Mola Pahnadayan <[email protected]>",
 				"Adis Hamzić <[email protected]>",
+				"Nick Ashley <[email protected]>",
 				null };
 		string[] artists = { "Matthieu James" + _(" (Faenza icon, modified)"), null };
 

src/TextMenu.vala

@@ -39,6 +39,11 @@ public class TextMenu : Object {
 
 	public string text { get; set; }
 
+	public string escape_parameters(string s) {
+		return s.replace("'", "'\\''");;
+	}
+
+
 	public TextMenu.load_from_file(string filename) {
 		var menu_file = new KeyFile();
 		try {
@@ -76,7 +81,7 @@ public class TextMenu : Object {
 
 					menu_item.activate.connect(() => {
 						var placeholder_substitutes = new Gee.ArrayList<string>();
-						placeholder_substitutes.add(text);
+						placeholder_substitutes.add(escape_parameters(text));
 						foreach (var command in commands) {
 							command.execute(placeholder_substitutes);
 						}