Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index c3474307bf4f8fe4d4473ab1f96d82c2763fad4b..167d44372d746e952412defc0aa12343ed0c970b 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -173,8 +173,14 @@ Will prompt you shell name when you type `C-u' before this command." t)
     (paren-activate))
 
 ;; elscreen
-(load "elscreen" "ElScreen" t)
-(elscreen-start)
+(condition-case e
+    (load "elscreen" "ElScreen" t)
+  (file-error
+   (if (equal (cadr e) "Cannot open load file")
+       (message "Warning: feature %s is absent" feature) ; warn and ignore
+     (apply 'signal (car e) (cdr e))))) ; rethrow
+(if (featurep 'elscreen)
+    (elscreen-start))
 (require-if-present 'elscreen-w3m)
 
 ;; undo-tree

diff --git a/dot-files/_vimperator/plugin/_libly_js b/dot-files/_vimperator/plugin/_libly_js
index 51035bf78aff872af7c5ae7543c16eae7d152b77..1ff4600fac9a01aa5e2231c6d1b85769c5f663e4 100644 (file)
--- a/dot-files/_vimperator/plugin/_libly_js
+++ b/dot-files/_vimperator/plugin/_libly_js
@@ -246,9 +246,10 @@ libly.$U = {//{{{
         function getPluginPath () {
           let pluginPath;
           Error('hoge').stack.split(/\n/).some(
-            function (s)
-              let (m = s.match(/-> liberator:\/\/template\/chrome:\/\/liberator\/content\/liberator\.js -> (.+):\d+$/))
-                (m && (pluginPath = m[1].replace(/\?.*$/, '')))
+            function (s) {
+              let m = s.match(/@chrome:\/\/liberator\/content\/liberator\.js -> file:\/\/\/(.+):\d+$/);
+              (m && (pluginPath = m[1].replace(/\?.*$/, '')));
+            }
           );
           return pluginPath;
         }
@@ -311,9 +312,8 @@ libly.$U = {//{{{
     evalJson: function(str, toRemove) {
         var json;
         try {
-            json = Components.classes['@mozilla.org/dom/json;1'].getService(Components.interfaces.nsIJSON);
             if (toRemove) str = str.substring(1, str.length - 1);
-            return json.decode(str);
+            return JSON.parse(str);
         } catch (e) { return null; }
     },
     dateFormat: function(dtm, fmt) {

diff --git a/dot-files/_vimperator/plugin/bitly_js b/dot-files/_vimperator/plugin/bitly_js
index 5d4af2dbddd17f285ec77994b3b9e9d23bfec708..5b654ed011e90c5384f891ae6eb7fc173729e42d 100644 (file)
--- a/dot-files/_vimperator/plugin/bitly_js
+++ b/dot-files/_vimperator/plugin/bitly_js
@@ -90,7 +90,10 @@ let PLUGIN_INFO = xml`
             callback();
           },
           {
-            default: let (e = content.document.querySelector('#bitly_api_key')) (e ? e.value : '')
+            default: (function () {
+              let e = content.document.querySelector('#bitly_api_key');
+              return e ? e.value : ''
+            })()
           }
         );
       }

diff --git a/dot-files/_vimperator/plugin/copy_js b/dot-files/_vimperator/plugin/copy_js
index 18b61f5f133765b11784190ab6ea61c1b1de43ca..fd72f9bc2f44f2de65fbd1917b5db6039302f1bb 100644 (file)
--- a/dot-files/_vimperator/plugin/copy_js
+++ b/dot-files/_vimperator/plugin/copy_js
@@ -362,7 +362,7 @@ var exCopyManager = {
         if (isError){
             liberator.echoerr('CopiedErrorString: `' + copyString + "'");
         } else {
-            liberator.echo('CopiedString: `' + util.escapeHTML(copyString || '') + "'");
+            liberator.echomsg('CopiedString: `' + util.escapeHTML(copyString || '') + "'");
         }
     }
 };

diff --git a/dot-files/_vimperator/plugin/multi_requester_js b/dot-files/_vimperator/plugin/multi_requester_js
index 90ca321e355ceac175fd4c6f4424318714e41ecc..4b9c9f9b7765edc00cc45264f42c42f65ba33353 100644 (file)
--- a/dot-files/_vimperator/plugin/multi_requester_js
+++ b/dot-files/_vimperator/plugin/multi_requester_js
@@ -304,7 +304,8 @@ var MultiRequester = {
       let srcEncode = info.srcEncode || "UTF-8";
       let urlEncode = info.urlEncode || srcEncode;
 
-      let repStrCount = let (m = url.match(/%s/g)) (m && m.length);
+      let m = url.match(/%s/g);
+      let repStrCount = m && m.length;
       if (repStrCount && !parsedArgs.strs.length) continue;
 
       // via. lookupDictionary.js

diff --git a/dot-files/_vimperator/plugin/prevent-pseudo-domain_js b/dot-files/_vimperator/plugin/prevent-pseudo-domain_js
index 0e4124cac2e504b200379a01b4bf979daa33ec9b..e23b483ddff018d4b43a954a3817d9968e68e7a2 100644 (file)
--- a/dot-files/_vimperator/plugin/prevent-pseudo-domain_js
+++ b/dot-files/_vimperator/plugin/prevent-pseudo-domain_js
@@ -29,7 +29,7 @@
         return !(validators.some(function(validator) { return validator(s); }));
     }
 
-    plugins.libly.$U.around(
+    liberator.plugins.libly.$U.around(
         liberator,
         'open',
         function (next, args) {

diff --git a/dot-files/_vimperator/plugin/relative_move_js b/dot-files/_vimperator/plugin/relative_move_js
index a75eff3ccf9a08e54bb8b6140369ad2b6614003e..c5ca14917b00a5fec2568b813bd3502122ca51f1 100644 (file)
--- a/dot-files/_vimperator/plugin/relative_move_js
+++ b/dot-files/_vimperator/plugin/relative_move_js
@@ -1,5 +1,5 @@
 // Vimperator plugin: Relative Move
-// Version: 0.1
+// Version: 0.3
 //
 // Usage:
 //   If you stay "http://example.com/aaa/bbb/ccc"
@@ -28,7 +28,7 @@
     function open_path(path, tab){
         var win = window.content.window;
         var loc = win.location;
-        var splited_path = path.split(/\/+/);
+        var splited_path = path.toString().split(/\/+/);
         var up = 0;
 
         if(!tab){
@@ -57,7 +57,7 @@
                 break;
             case -1: // "./hoge"
                 base = trim_query(loc.href);
-                path = path.substring(2);
+                path = path.toString().substring(2);
                 if(base[base.length-1] == "/")
                     url = base + path;
                 else
@@ -72,7 +72,7 @@
                 while(c < up){
                     if(c > 0) base = base.substr(0, base.length-1);
                     [base] = base.match(/^.*\/(?=[^\/]*$)/);
-                    path = path.substring(3);
+                    path = path.toString().substring(3);
                     c++;
                 }
                 url = base + path;