diff --git a/_keysnail.js b/_keysnail.js index 1b359af..ddd882e 100644 --- a/_keysnail.js +++ b/_keysnail.js @@ -554,10 +554,6 @@ key.setGlobalKey('C-h', function (ev, arg) { return; }, 'ignore'); -key.setViewKey('L', function (ev, arg) { - ext.exec("hok-start-foreground-mode", arg, ev); -}, 'Start Hit a Hint foreground mode', true); - key.setGlobalKey('', function (ev, arg) { let (elem = document.commandDispatcher.focusedElement) elem && elem.blur(); gBrowser.focus(); @@ -569,6 +565,18 @@ key.setGlobalKey('C-p', function (ev, arg) { document.getElementById("keysnail-prompt-textbox").focus(); }, 'KeySnail のプロンプトへフォーカス', true); +key.setGlobalKey('C-j', function (ev) { + getBrowser().mTabContainer.advanceSelectedTab(1, true); +}, 'ひとつ右のタブへ'); + +key.setGlobalKey('C-k', function (ev) { + getBrowser().mTabContainer.advanceSelectedTab(-1, true); +}, 'ひとつ左のタブへ'); + +key.setViewKey('L', function (ev, arg) { + ext.exec("hok-start-foreground-mode", arg, ev); +}, 'Start Hit a Hint foreground mode', true); + key.setViewKey('c', function (ev) { command.interpreter(); }, 'JavaScript のコードを評価'); @@ -691,11 +699,11 @@ key.setViewKey('a', function (ev, arg) { allTabs.open(); }, 'alltabs.open'); -key.setViewKey('', function (ev) { +key.setViewKey([[''], ['h']], function (ev) { goDoCommand("cmd_scrollPageUp"); }, '一画面分スクロールアップ'); -key.setViewKey('', function (ev) { +key.setViewKey([[''], ['l']], function (ev) { goDoCommand("cmd_scrollPageDown"); }, '一画面スクロールダウン'); @@ -732,10 +740,6 @@ key.setViewKey('T', function (ev, arg) { ext.exec("mstranslator-open-prompt", arg, ev); }, 'MSTranslator - Open prompt', true); -key.setEditKey('C-', function (ev) { - command.walkInputElement(command.elementsRetrieverTextarea, true, true); -}, '次のテキストエリアへフォーカス'); - key.setViewKey('j', function (ev) { key.generateKey(ev.originalTarget, KeyEvent.DOM_VK_DOWN, true); }, '一行スクロールダウン'); @@ -744,14 +748,6 @@ key.setViewKey('k', function (ev) { key.generateKey(ev.originalTarget, KeyEvent.DOM_VK_UP, true); }, '一行スクロールアップ'); -key.setViewKey('J', function (ev) { - getBrowser().mTabContainer.advanceSelectedTab(1, true); -}, 'ひとつ右のタブへ'); - -key.setViewKey('K', function (ev) { - getBrowser().mTabContainer.advanceSelectedTab(-1, true); -}, 'ひとつ左のタブへ'); - key.setViewKey('b', function (ev) { BrowserBack(); }, '戻る'); @@ -760,10 +756,6 @@ key.setViewKey('B', function (ev) { BrowserForward(); }, '進む'); -key.setViewKey('l', function (ev) { - goDoCommand("cmd_scrollPageDown"); -}, '一画面スクロールダウン'); - -key.setViewKey('h', function (ev) { - goDoCommand("cmd_scrollPageUp"); -}, '一画面分スクロールアップ'); +key.setEditKey('C-', function (ev) { + command.walkInputElement(command.elementsRetrieverTextarea, true, true); +}, '次のテキストエリアへフォーカス'); diff --git a/emacs.el b/emacs.el index 34dd5dd..b188889 100644 --- a/emacs.el +++ b/emacs.el @@ -1777,7 +1777,11 @@ this is test, does not rename files" ;; (setq python-python-command "c:/Python26/python.exe") (define-key my-prefix-map (kbd "C-c") 'start-ckw-bash) - (my-w32-add-export-path "c:/WINDOWS" + (my-w32-add-export-path "c:/Windows/system" + "c:/Windows/System32" + "c:/Program Files/Git/bin" + "c:/MinGW/bin" + "c:/MinGW/mingw32/bin" (expand-file-name "~/bin") (expand-file-name "~/dbx/apps/bin")) @@ -1785,4 +1789,3 @@ this is test, does not rename files" (setq w32-enable-synthesized-fonts t)) (setq file-name-coding-system 'sjis)) -