Merge branch 'master' of 192.168.1.95:doteverything
This commit is contained in:
commit
f306fa4561
2 changed files with 49 additions and 28 deletions
32
.conkerorrc
32
.conkerorrc
|
@ -8,14 +8,27 @@ require("clicks-in-new-buffer.js");
|
||||||
sheet.append("stylesheets");
|
sheet.append("stylesheets");
|
||||||
sheet.append("tabs.css");
|
sheet.append("tabs.css");
|
||||||
register_user_stylesheet(make_uri(sheet));
|
register_user_stylesheet(make_uri(sheet));
|
||||||
}*/
|
}
|
||||||
function test(window)
|
function test(window)
|
||||||
{
|
{
|
||||||
var test = window.tab2-bar;
|
//var test = window.getElementsByAttribute("id", "tab2-bar");
|
||||||
window.buffers.container.removeChild(test);
|
//if (test.length > 0)
|
||||||
|
// window.removeChild(test);
|
||||||
|
//else
|
||||||
|
// window.minibuffer.message("no luck");
|
||||||
|
var after = window.document.getElementById("minibuffer");
|
||||||
|
var testtab = window.document.getElementById("tab2-bar");
|
||||||
|
|
||||||
|
window["minibuffer"].message("I'm different!");
|
||||||
|
|
||||||
|
window.tab_bar.destroy();
|
||||||
|
delete window.tab_bar;
|
||||||
|
|
||||||
|
window.tab_bar = testtab;
|
||||||
|
after.parentNode.insertBefore(testtab, after);
|
||||||
}
|
}
|
||||||
|
|
||||||
//add_hook("window_initialize_hook", test);
|
add_hook("window_initialize_late_hook", test);*/
|
||||||
|
|
||||||
// VARIABLES
|
// VARIABLES
|
||||||
// Make middle mouse button open new tab in background
|
// Make middle mouse button open new tab in background
|
||||||
|
@ -28,7 +41,8 @@ define_webjump("delicious",
|
||||||
define_webjump("gmail",
|
define_webjump("gmail",
|
||||||
"https://mail.google.com/mail/#search/%s");
|
"https://mail.google.com/mail/#search/%s");
|
||||||
define_webjump("greader",
|
define_webjump("greader",
|
||||||
"http://www.google.com/reader/view/#search/%s/");
|
"http://www.google.com/reader/view/#search/%s/",
|
||||||
|
$alternative="http://reader.google.com");
|
||||||
define_webjump("github",
|
define_webjump("github",
|
||||||
"http://github.com/search?q=%s",
|
"http://github.com/search?q=%s",
|
||||||
$alternative="http://github.com/ryuslash/");
|
$alternative="http://github.com/ryuslash/");
|
||||||
|
@ -36,6 +50,8 @@ define_webjump("archwiki",
|
||||||
"http://wiki.archlinux.org/index.php?search=%s");
|
"http://wiki.archlinux.org/index.php?search=%s");
|
||||||
define_webjump("fedorawiki",
|
define_webjump("fedorawiki",
|
||||||
"https://fedoraproject.org/wiki/search=%s");
|
"https://fedoraproject.org/wiki/search=%s");
|
||||||
|
define_webjump("metal-archives",
|
||||||
|
"http://www.metal-archives.com/search.php?string=%s&type=band");
|
||||||
|
|
||||||
// FUNCTIONS
|
// FUNCTIONS
|
||||||
interactive("delicious-post",
|
interactive("delicious-post",
|
||||||
|
@ -58,7 +74,8 @@ interactive("delicious-post",
|
||||||
"&extended=" +
|
"&extended=" +
|
||||||
encodeURIComponent(
|
encodeURIComponent(
|
||||||
yield I.minibuffer.read(
|
yield I.minibuffer.read(
|
||||||
$prompt = "extended description: "));
|
$prompt = "extended description: ")) +
|
||||||
|
"&replace=no";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
var content = yield send_http_request(
|
var content = yield send_http_request(
|
||||||
|
@ -88,7 +105,8 @@ interactive("delicious-post-link",
|
||||||
"&extended=" +
|
"&extended=" +
|
||||||
encodeURIComponent(
|
encodeURIComponent(
|
||||||
yield I.minibuffer.read(
|
yield I.minibuffer.read(
|
||||||
$prompt = "extended description: "));
|
$prompt = "extended description: ")) +
|
||||||
|
"&replace=no";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
var content = yield send_http_request(
|
var content = yield send_http_request(
|
||||||
|
|
|
@ -24,8 +24,11 @@
|
||||||
(mode-line ((t (:foreground "#B3B3B3" :background "#43527A" :background "#000000" :box nil))))
|
(mode-line ((t (:foreground "#B3B3B3" :background "#43527A" :background "#000000" :box nil))))
|
||||||
(region ((t (:background "#3D3D3D"))))
|
(region ((t (:background "#3D3D3D"))))
|
||||||
(minibuffer-prompt ((t (:foreground "#72F3FF" :bold t))))
|
(minibuffer-prompt ((t (:foreground "#72F3FF" :bold t))))
|
||||||
|
(flymake-warnline ((t (:background "#000060"))))
|
||||||
|
(flymake-errline ((t (:background "#600000"))))
|
||||||
(font-lock-builtin-face ((t (:foreground "#C436C4"))))
|
(font-lock-builtin-face ((t (:foreground "#C436C4"))))
|
||||||
(font-lock-comment-face ((t (:foreground "#00A000" :background "#004000" :bold t :box (:line-width 1 :color "#006000" :style nil)))))
|
(font-lock-comment-face ((t (:foreground "#00AC00" :background "#004000" :bold t :box (:line-width 1 :color "#006000" :style nil)))))
|
||||||
|
(font-lock-comment-delimiter-face ((t (:inherit 'font-lock-comment-face))))
|
||||||
(font-lock-function-name-face ((t (:foreground "#0FFF28"))))
|
(font-lock-function-name-face ((t (:foreground "#0FFF28"))))
|
||||||
(font-lock-keyword-face ((t (:foreground "#4E61BB" :bold t))))
|
(font-lock-keyword-face ((t (:foreground "#4E61BB" :bold t))))
|
||||||
(font-lock-string-face ((t (:foreground "#E00900"))))
|
(font-lock-string-face ((t (:foreground "#E00900"))))
|
||||||
|
|
Loading…
Reference in a new issue