Merge branch 'master' into testing

1 files changed, 8 insertions, 0 deletions

diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js
index b0746b85..54818702 100644
--- a/ext/fg/js/api.js
+++ b/ext/fg/js/api.js
@@ -21,6 +21,10 @@ function apiOptionsGet(optionsContext) {
     return utilInvoke('optionsGet', {optionsContext});
 }
 
+function apiOptionsSet(changedOptions, optionsContext, source) {
+    return utilInvoke('optionsSet', {changedOptions, optionsContext, source});
+}
+
 function apiTermsFind(text, optionsContext) {
     return utilInvoke('termsFind', {text, optionsContext});
 }
@@ -72,3 +76,7 @@ function apiInjectStylesheet(css) {
 function apiGetEnvironmentInfo() {
     return utilInvoke('getEnvironmentInfo');
 }
+
+function apiClipboardGet() {
+    return utilInvoke('clipboardGet');
+}