Merge remote-tracking branch 'origin/master' into phoenix

1 files changed, 6 insertions, 0 deletions

diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js
index 5d03951..f4818d8 100644
--- a/.conkerorrc/init.js
+++ b/.conkerorrc/init.js
@@ -17,6 +17,11 @@ define_browser_object_class(
     }
 );
 
+function ext_title_format(window) {
+    return '(' + get_current_profile() +') '
+        + window.buffers.current.description;
+}
+
 function oni_before_quit_func() {
     var w = get_recent_conkeror_window();
     var result = (w == null) ||
@@ -154,6 +159,7 @@ content_policy_bytype_table.object = oni_block_flash;
 cwd = make_file("/home/slash/downloads/");
 hint_digits = "arstdhneio";
 read_buffer_show_icons = true;
+title_format_fn = ext_title_format;
 url_remoting_fn = load_url_in_new_buffer;
 
 define_key(content_buffer_normal_keymap, "h",