Merge remote-tracking branch 'origin/master' into phoenix
This commit is contained in:
commit
258cda86ca
2 changed files with 24 additions and 25 deletions
|
@ -1,6 +1,8 @@
|
|||
require("content-policy.js");
|
||||
require("favicon");
|
||||
|
||||
var linkwave_program = "/home/slash/var/src/linkwave/src/linkwave";
|
||||
|
||||
theme_load_paths.push("/home/slash/.conkerorrc/themes/");
|
||||
|
||||
define_browser_object_class(
|
||||
|
@ -43,17 +45,21 @@ function oni_linkwave_add(I) {
|
|||
check_buffer(I.buffer, content_buffer);
|
||||
let url =
|
||||
load_spec_uri_string(load_spec(I.buffer.top_frame));
|
||||
let title = escape(yield I.minibuffer.read(
|
||||
let title = yield I.minibuffer.read(
|
||||
$prompt = "name (required): ",
|
||||
$initial_value = I.buffer.title));
|
||||
let tags = escape(yield I.minibuffer.read(
|
||||
$prompt = "tags (space delimited): "));
|
||||
let description = escape(yield I.minibuffer.read(
|
||||
$prompt = "extended description: "));
|
||||
let command =
|
||||
'/home/slash/development/projects/linkwave/src/linkwave "'
|
||||
+ url + '" "' + title + '" "' + description + '"';
|
||||
I.window.minibuffer.message(command);
|
||||
$initial_value = I.buffer.title);
|
||||
// let tags = escape(yield I.minibuffer.read(
|
||||
// $prompt = "tags (space delimited): "));
|
||||
let description = yield I.minibuffer.read(
|
||||
$prompt = "extended description: ");
|
||||
let command = linkwave_program + ' "' + url + '" "' + title + '" "'
|
||||
+ description + '"';
|
||||
let result = yield shell_command(command);
|
||||
|
||||
if (!result)
|
||||
I.window.minibuffer.message('Added to linkwave');
|
||||
else
|
||||
I.window.minibuffer.message('Couldn\'t add to linkwave');
|
||||
}
|
||||
interactive("linkwave-add", "Bookmark the page in linkwave",
|
||||
oni_linkwave_add);
|
||||
|
@ -63,16 +69,15 @@ function oni_linkwave_add_link(I) {
|
|||
let url = load_spec_uri_string(
|
||||
load_spec(encodeURIComponent(bo)));
|
||||
check_buffer(I.buffer, content_buffer);
|
||||
let title = escape(yield I.minibuffer.read(
|
||||
let title = yield I.minibuffer.read(
|
||||
$prompt = "name (required): ",
|
||||
$initial_value = bo.textContent));
|
||||
let tags = escape(yield I.minibuffer.read(
|
||||
$prompt = "tags (space delimited): "));
|
||||
let description = escape(yield I.minibuffer.read(
|
||||
$prompt = "extended description: "));
|
||||
let command =
|
||||
'/home/slash/development/projects/linkwave/src/linkwave "'
|
||||
+ url + '" "' + title + '" "' + description + '"';
|
||||
$initial_value = bo.textContent);
|
||||
// let tags = escape(yield I.minibuffer.read(
|
||||
// $prompt = "tags (space delimited): "));
|
||||
let description = yield I.minibuffer.read(
|
||||
$prompt = "extended description: ");
|
||||
let command = linkwave_program + ' "' + url + '" "' + title + '" "'
|
||||
+ description + '"';
|
||||
let result = yield shell_command(command);
|
||||
|
||||
if (!result)
|
||||
|
|
6
.xinitrc
6
.xinitrc
|
@ -9,12 +9,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
|
|||
unset f
|
||||
fi
|
||||
|
||||
pidof mpdscribble >& /dev/null
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
mpdscribble &
|
||||
fi
|
||||
|
||||
emacs --daemon &
|
||||
fehlstart &
|
||||
|
||||
|
|
Loading…
Reference in a new issue