Import r6948 from upstream hg supporting Firefox up to 24.*

[dactyl.git] / common / modules / messages.jsm

diff --git a/common/modules/messages.jsm b/common/modules/messages.jsm
index 12ab0f357fa94b2195db31466b6bb2bdabea2506..533c0043d5686f25a90e4962156a33a5893a0dd1 100644 (file)
--- a/common/modules/messages.jsm
+++ b/common/modules/messages.jsm
@@ -98,7 +98,7 @@ var Messages = Module("messages", {
         file = io.File(file);
 
         function properties(base, iter_, prop) iter(function _properties() {
-            function key() [base, obj.identifier || obj.name].concat(Array.slice(arguments)).join(".").replace(/[\\:=]/g, "\\$&");
+            function key(...args) [base, obj.identifier || obj.name].concat(args).join(".").replace(/[\\:=]/g, "\\$&");
 
             prop = prop || "description";
             for (var obj in iter_) {
@@ -147,7 +147,6 @@ var Messages = Module("messages", {
                 obj[_prop] = this.default;
                 return {
                     get: function get() {
-                        let self = this;
                         let value = this[_prop];
 
                         function getter(key, default_) function getter() messages.get([name, key].join("."), default_);
@@ -205,4 +204,4 @@ endModule();
 
 // catch(e){ if (!e.stack) e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); }
 
-// vim: set fdm=marker sw=4 ts=4 et ft=javascript:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et ft=javascript: