13 files changed, 722 insertions, 1180 deletions

diff --git a/doc/asciidoc.css b/doc/asciidoc.css
index 66466b877..75dc4fdc9 100644
--- a/doc/asciidoc.css
+++ b/doc/asciidoc.css
@@ -1,3 +1,6 @@
+body {
+    margin: 1em 2em 1em 2em;
+}
 div.sectionbody {
     font-family: serif,Helvetica,arial;
 }
diff --git a/doc/de/autogen/plugin_api/hdata.txt b/doc/de/autogen/plugin_api/hdata.txt
index d9790f084..ce30586e7 100644
--- a/doc/de/autogen/plugin_api/hdata.txt
+++ b/doc/de/autogen/plugin_api/hdata.txt
@@ -19,22 +19,22 @@
   'pv_remote_nick_color' (string) +
   'hook_autorejoin' (pointer) +
   'nicks_count' (integer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
+  'nicks' (pointer, hdata: 'irc_nick') +
+  'last_nick' (pointer, hdata: 'irc_nick') +
   'nicks_speaking' (pointer) +
-  'nicks_speaking_time' (pointer) +
-  'last_nick_speaking_time' (pointer) +
-  'buffer' (pointer) +
+  'nicks_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'last_nick_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'prev_channel' (pointer) +
-  'next_channel' (pointer) |
+  'prev_channel' (pointer, hdata: 'irc_channel') +
+  'next_channel' (pointer, hdata: 'irc_channel') |
   -
 
 | irc | irc_channel_speaking | IRC channel_speaking |
   'nick' (string) +
   'time_last_message' (time) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
+  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
   -
 
 | irc | irc_ignore | IRC ignorieren |
@@ -43,8 +43,8 @@
   'regex_mask' (pointer) +
   'server' (string) +
   'channel' (string) +
-  'prev_ignore' (pointer) +
-  'next_ignore' (pointer) |
+  'prev_ignore' (pointer, hdata: 'irc_ignore') +
+  'next_ignore' (pointer, hdata: 'irc_ignore') |
   'irc_ignore_list' +
   'last_irc_ignore'
 
@@ -55,23 +55,23 @@
   'prefix' (string) +
   'away' (integer) +
   'color' (string) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_nick') +
+  'next_nick' (pointer, hdata: 'irc_nick') |
   -
 
 | irc | irc_notify | IRC-Benachrichtigungen |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'nick' (string) +
   'check_away' (integer) +
   'is_on_server' (integer) +
   'away_message' (string) +
   'ison_received' (integer) +
-  'prev_notify' (pointer) +
-  'next_notify' (pointer) |
+  'prev_notify' (pointer, hdata: 'irc_notify') +
+  'next_notify' (pointer, hdata: 'irc_notify') |
   -
 
 | irc | irc_redirect | IRC Umlenkung |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'pattern' (string) +
   'signal' (string) +
   'count' (integer) +
@@ -88,8 +88,8 @@
   'cmd_filter' (pointer) +
   'output' (string) +
   'output_size' (integer) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect') +
+  'next_redirect' (pointer, hdata: 'irc_redirect') |
   -
 
 | irc | irc_redirect_pattern | Muster für IRC Umlenkung |
@@ -99,8 +99,8 @@
   'cmd_start' (string) +
   'cmd_stop' (string) +
   'cmd_extra' (string) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
+  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
   'irc_redirect_patterns' +
   'last_irc_redirect_pattern'
 
@@ -118,10 +118,10 @@
   'current_ip' (string) +
   'current_port' (integer) +
   'sock' (integer) +
-  'hook_connect' (pointer) +
-  'hook_fd' (pointer) +
-  'hook_timer_connection' (pointer) +
-  'hook_timer_sasl' (pointer) +
+  'hook_connect' (pointer, hdata: 'hook') +
+  'hook_fd' (pointer, hdata: 'hook') +
+  'hook_timer_connection' (pointer, hdata: 'hook') +
+  'hook_timer_sasl' (pointer, hdata: 'hook') +
   'is_connected' (integer) +
   'ssl_connected' (integer) +
   'gnutls_sess' (other) +
@@ -153,17 +153,17 @@
   'last_away_check' (time) +
   'outqueue' (pointer) +
   'last_outqueue' (pointer) +
-  'redirects' (pointer) +
-  'last_redirect' (pointer) +
-  'notify_list' (pointer) +
-  'last_notify' (pointer) +
+  'redirects' (pointer, hdata: 'irc_redirect') +
+  'last_redirect' (pointer, hdata: 'irc_redirect') +
+  'notify_list' (pointer, hdata: 'irc_notify') +
+  'last_notify' (pointer, hdata: 'irc_notify') +
   'manual_joins' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'channels' (pointer) +
-  'last_channel' (pointer) +
-  'prev_server' (pointer) +
-  'next_server' (pointer) |
+  'channels' (pointer, hdata: 'irc_channel') +
+  'last_channel' (pointer, hdata: 'irc_channel') +
+  'prev_server' (pointer, hdata: 'irc_server') +
+  'next_server' (pointer, hdata: 'irc_server') |
   'irc_servers' +
   'last_irc_server'
 
@@ -177,23 +177,23 @@
   'items_array' (pointer) +
   'bar_window' (pointer) +
   'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer) +
-  'next_bar' (pointer) |
+  'prev_bar' (pointer, hdata: 'bar') +
+  'next_bar' (pointer, hdata: 'bar') |
   'gui_bars' +
   'last_gui_bar'
 
 | weechat | bar_item | Bar-Item |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'build_callback' (pointer) +
   'build_callback_data' (pointer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'bar_item') +
+  'next_item' (pointer, hdata: 'bar_item') |
   'gui_bar_items' +
   'last_gui_bar_item'
 
 | weechat | buffer | Buffer |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'plugin_name_for_upgrade' (string) +
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
@@ -209,14 +209,14 @@
   'close_callback' (pointer) +
   'close_callback_data' (pointer) +
   'title' (string) +
-  'own_lines' (pointer) +
-  'mixed_lines' (pointer) +
-  'lines' (pointer) +
+  'own_lines' (pointer, hdata: 'lines') +
+  'mixed_lines' (pointer, hdata: 'lines') +
+  'lines' (pointer, hdata: 'lines') +
   'time_for_each_line' (integer) +
   'chat_refresh_needed' (integer) +
   'nicklist' (integer) +
   'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer) +
+  'nicklist_root' (pointer, hdata: 'nick_group') +
   'nicklist_max_length' (integer) +
   'nicklist_display_groups' (integer) +
   'nicklist_visible_count' (integer) +
@@ -230,15 +230,15 @@
   'input_buffer_length' (integer) +
   'input_buffer_pos' (integer) +
   'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer) +
-  'input_undo' (pointer) +
-  'last_input_undo' (pointer) +
-  'ptr_input_undo' (pointer) +
+  'input_undo_snap' (pointer, hdata: 'input_undo') +
+  'input_undo' (pointer, hdata: 'input_undo') +
+  'last_input_undo' (pointer, hdata: 'input_undo') +
+  'ptr_input_undo' (pointer, hdata: 'input_undo') +
   'input_undo_count' (integer) +
-  'completion' (pointer) +
-  'history' (pointer) +
-  'last_history' (pointer) +
-  'ptr_history' (pointer) +
+  'completion' (pointer, hdata: 'completion') +
+  'history' (pointer, hdata: 'history') +
+  'last_history' (pointer, hdata: 'history') +
+  'ptr_history' (pointer, hdata: 'history') +
   'num_history' (integer) +
   'text_search' (integer) +
   'text_search_exact' (integer) +
@@ -251,17 +251,17 @@
   'highlight_tags_count' (integer) +
   'highlight_tags_array' (pointer) +
   'hotlist_max_level_nicks' (pointer) +
-  'keys' (pointer) +
-  'last_key' (pointer) +
+  'keys' (pointer, hdata: 'key') +
+  'last_key' (pointer, hdata: 'key') +
   'keys_count' (integer) +
   'local_variables' (pointer) +
-  'prev_buffer' (pointer) +
-  'next_buffer' (pointer) |
+  'prev_buffer' (pointer, hdata: 'buffer') +
+  'next_buffer' (pointer, hdata: 'buffer') |
   'gui_buffers' +
   'last_gui_buffer'
 
 | weechat | completion | Struktur mit Vervollständigung |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'context' (integer) +
   'base_command' (string) +
   'base_command_arg_index' (integer) +
@@ -278,34 +278,34 @@
   'position_replace' (integer) +
   'diff_size' (integer) +
   'diff_length' (integer) +
-  'partial_completion_list' (pointer) +
-  'last_partial_completion' (pointer) |
+  'partial_completion_list' (pointer, hdata: 'completion_partial') +
+  'last_partial_completion' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | completion_partial | Struktur mit teilweise Vervollständigung |
   'word' (string) +
   'count' (integer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'completion_partial') +
+  'next_item' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | config_file | Konfigurationsdatei |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'filename' (string) +
   'file' (pointer) +
   'callback_reload' (pointer) +
   'callback_reload_data' (pointer) +
-  'sections' (pointer) +
-  'last_section' (pointer) +
-  'prev_config' (pointer) +
-  'next_config' (pointer) |
+  'sections' (pointer, hdata: 'config_section') +
+  'last_section' (pointer, hdata: 'config_section') +
+  'prev_config' (pointer, hdata: 'config_file') +
+  'next_config' (pointer, hdata: 'config_file') |
   'config_files' +
   'last_config_file'
 
 | weechat | config_option | Konfigurationsoptionen |
-  'config_file' (pointer) +
-  'section' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
+  'section' (pointer, hdata: 'config_section') +
   'name' (string) +
   'type' (integer) +
   'description' (string) +
@@ -322,12 +322,12 @@
   'callback_delete' (pointer) +
   'callback_delete_data' (pointer) +
   'loaded' (integer) +
-  'prev_option' (pointer) +
-  'next_option' (pointer) |
+  'prev_option' (pointer, hdata: 'config_option') +
+  'next_option' (pointer, hdata: 'config_option') |
   -
 
 | weechat | config_section | Konfigurationssektion |
-  'config_file' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
   'name' (string) +
   'user_can_add_options' (integer) +
   'user_can_delete_options' (integer) +
@@ -341,10 +341,10 @@
   'callback_create_option_data' (pointer) +
   'callback_delete_option' (pointer) +
   'callback_delete_option_data' (pointer) +
-  'options' (pointer) +
-  'last_option' (pointer) +
-  'prev_section' (pointer) +
-  'next_section' (pointer) |
+  'options' (pointer, hdata: 'config_option') +
+  'last_option' (pointer, hdata: 'config_option') +
+  'prev_section' (pointer, hdata: 'config_section') +
+  'next_section' (pointer, hdata: 'config_section') |
   -
 
 | weechat | filter | Filter |
@@ -359,206 +359,42 @@
   'regex' (string) +
   'regex_prefix' (pointer) +
   'regex_message' (pointer) +
-  'prev_filter' (pointer) +
-  'next_filter' (pointer) |
+  'prev_filter' (pointer, hdata: 'filter') +
+  'next_filter' (pointer, hdata: 'filter') |
   'gui_filters' +
   'last_gui_filter'
 
 | weechat | history | Verlaufspeicher von Befehlen in einem Buffer |
   'text' (string) +
-  'next_history' (pointer) +
-  'prev_history' (pointer) |
+  'next_history' (pointer, hdata: 'history') +
+  'prev_history' (pointer, hdata: 'history') |
   -
 
-| weechat | hook | Hook (Variablen die für alle Hook-Typen geläufig sind) |
-  'plugin' (pointer) +
-  'type' (integer) +
-  'deleted' (integer) +
-  'running' (integer) +
-  'priority' (integer) +
-  'callback_data' (pointer) +
-  'hook_data' (pointer) +
-  'prev_hook' (pointer) +
-  'next_hook' (pointer) |
-  -
-
-| weechat | hook_command | Hook des Typs "command" |
-  'callback' (pointer) +
-  'command' (string) +
-  'description' (string) +
-  'args' (string) +
-  'args_description' (string) +
-  'completion' (string) +
-  'cplt_num_templates' (integer) +
-  'cplt_templates' (pointer) +
-  'cplt_templates_static' (pointer) +
-  'cplt_template_num_args' (pointer) +
-  'cplt_template_args' (pointer) +
-  'cplt_template_num_args_concat' (integer) +
-  'cplt_template_args_concat' (pointer) |
-  'last_weechat_hook_command' +
-  'weechat_hooks_command'
-
-| weechat | hook_command_run | Hook vom Typ "command_run" |
-  'callback' (pointer) +
-  'command' (string) |
-  'last_weechat_hook_command_run' +
-  'weechat_hooks_command_run'
-
-| weechat | hook_completion | Hook vom Typ "completion" |
-  'callback' (pointer) +
-  'completion_item' (string) +
-  'description' (string) |
-  'last_weechat_hook_completion' +
-  'weechat_hooks_completion'
-
-| weechat | hook_config | Hook vom Typ "config" |
-  'callback' (pointer) +
-  'option' (string) |
-  'last_weechat_hook_config' +
-  'weechat_hooks_config'
-
-| weechat | hook_connect | Hook vom Typ "connect" |
-  'callback' (pointer) +
-  'proxy' (string) +
-  'address' (string) +
-  'port' (integer) +
-  'sock' (integer) +
-  'ipv6' (integer) +
-  'gnutls_sess' (pointer) +
-  'gnutls_cb' (pointer) +
-  'gnutls_dhkey_size' (integer) +
-  'gnutls_priorities' (string) +
-  'local_hostname' (string) +
-  'child_read' (integer) +
-  'child_write' (integer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'handshake_hook_fd' (pointer) +
-  'handshake_hook_timer' (pointer) +
-  'handshake_fd_flags' (integer) +
-  'handshake_ip_address' (string) |
-  'last_weechat_hook_connect' +
-  'weechat_hooks_connect'
-
-| weechat | hook_fd | Hook vom Typ "fd" |
-  'callback' (pointer) +
-  'fd' (integer) +
-  'flags' (integer) +
-  'error' (integer) |
-  'last_weechat_hook_fd' +
-  'weechat_hooks_fd'
-
-| weechat | hook_hdata | Hook vom Typ "hdata" |
-  'callback' (pointer) +
-  'hdata_name' (string) +
-  'description' (string) |
-  'last_weechat_hook_hdata' +
-  'weechat_hooks_hdata'
-
-| weechat | hook_hsignal | Hook vom Typ "" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_hsignal' +
-  'weechat_hooks_hsignal'
-
-| weechat | hook_info | Hook vom Typ "info" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_info' +
-  'weechat_hooks_info'
-
-| weechat | hook_info_hashtable | Hook vom Typ "info_hashtable" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) +
-  'output_description' (string) |
-  'last_weechat_hook_info_hashtable' +
-  'weechat_hooks_info_hashtable'
-
-| weechat | hook_infolist | Hook vom Typ "infolist" |
-  'callback' (pointer) +
-  'infolist_name' (string) +
-  'description' (string) +
-  'pointer_description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_infolist' +
-  'weechat_hooks_infolist'
-
-| weechat | hook_modifier | Hook vom Typ "modifier" |
-  'callback' (pointer) +
-  'modifier' (string) |
-  'last_weechat_hook_modifier' +
-  'weechat_hooks_modifier'
-
-| weechat | hook_print | Hook vom Typ "print" |
-  'callback' (pointer) +
-  'buffer' (pointer) +
-  'tags_count' (integer) +
-  'tags_array' (pointer) +
-  'message' (string) +
-  'strip_colors' (integer) |
-  'last_weechat_hook_print' +
-  'weechat_hooks_print'
-
-| weechat | hook_process | Hook vom Typ "process" |
-  'callback' (pointer) +
-  'command' (string) +
-  'timeout' (long) +
-  'child_read' (pointer) +
-  'child_write' (pointer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'hook_timer' (pointer) +
-  'buffer' (pointer) +
-  'buffer_size' (pointer) |
-  'last_weechat_hook_process' +
-  'weechat_hooks_process'
-
-| weechat | hook_signal | Hook vom Typ "signal" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_signal' +
-  'weechat_hooks_signal'
-
-| weechat | hook_timer | Hook vom Typ "timer" |
-  'callback' (pointer) +
-  'interval' (long) +
-  'align_second' (integer) +
-  'remaining_calls' (integer) +
-  'last_exec' (other) +
-  'next_exec' (other) |
-  'last_weechat_hook_timer' +
-  'weechat_hooks_timer'
-
 | weechat | input_undo | Struktur der Rücknahmen für die Befehlszeile |
   'data' (string) +
   'pos' (integer) +
-  'prev_undo' (pointer) +
-  'next_undo' (pointer) |
+  'prev_undo' (pointer, hdata: 'input_undo') +
+  'next_undo' (pointer, hdata: 'input_undo') |
   -
 
 | weechat | key | Tastenbelegung (Tastaturkurzbefehl) |
   'key' (string) +
   'command' (string) +
-  'prev_key' (pointer) +
-  'next_key' (pointer) |
+  'prev_key' (pointer, hdata: 'key') +
+  'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +
   'gui_keys' +
   'last_gui_default_key' +
   'last_gui_key'
 
 | weechat | line | Struktur mit einer Zeile |
-  'data' (pointer) +
-  'prev_line' (pointer) +
-  'next_line' (pointer) |
+  'data' (pointer, hdata: 'line_data') +
+  'prev_line' (pointer, hdata: 'line') +
+  'next_line' (pointer, hdata: 'line') |
   -
 
 | weechat | line_data | Struktur mit einzeiligen Daten |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'y' (integer) +
   'date' (time) +
   'date_printed' (time) +
@@ -574,9 +410,9 @@
   -
 
 | weechat | lines | Struktur mit Zeilen |
-  'first_line' (pointer) +
-  'last_line' (pointer) +
-  'last_read_line' (pointer) +
+  'first_line' (pointer, hdata: 'line') +
+  'last_line' (pointer, hdata: 'line') +
+  'last_read_line' (pointer, hdata: 'line') +
   'lines_count' (integer) +
   'first_line_not_read' (integer) +
   'lines_hidden' (integer) +
@@ -585,14 +421,14 @@
   -
 
 | weechat | nick | Nick in Nickliste |
-  'group' (pointer) +
+  'group' (pointer, hdata: 'nick_group') +
   'name' (string) +
   'color' (string) +
   'prefix' (string) +
   'prefix_color' (string) +
   'visible' (integer) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'nick') +
+  'next_nick' (pointer, hdata: 'nick') |
   -
 
 | weechat | nick_group | Gruppen in Nickliste |
@@ -600,15 +436,30 @@
   'color' (string) +
   'visible' (integer) +
   'level' (integer) +
-  'parent' (pointer) +
-  'childs' (pointer) +
-  'last_child' (pointer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
-  'prev_group' (pointer) +
-  'next_group' (pointer) |
+  'parent' (pointer, hdata: 'nick_group') +
+  'childs' (pointer, hdata: 'nick_group') +
+  'last_child' (pointer, hdata: 'nick_group') +
+  'nicks' (pointer, hdata: 'nick') +
+  'last_nick' (pointer, hdata: 'nick') +
+  'prev_group' (pointer, hdata: 'nick_group') +
+  'next_group' (pointer, hdata: 'nick_group') |
   -
 
+| weechat | plugin | plugin |
+  'filename' (string) +
+  'handle' (pointer) +
+  'name' (string) +
+  'description' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'charset' (string) +
+  'debug' (integer) +
+  'prev_plugin' (pointer, hdata: 'plugin') +
+  'next_plugin' (pointer, hdata: 'plugin') |
+  'last_weechat_plugin' +
+  'weechat_plugins'
+
 | weechat | window | Fenster |
   'win_x' (integer) +
   'win_y' (integer) +
@@ -626,37 +477,37 @@
   'last_bar_window' (pointer) +
   'refresh_needed' (integer) +
   'gui_objects' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'layout_plugin_name' (string) +
   'layout_buffer_name' (string) +
-  'scroll' (pointer) +
-  'ptr_tree' (pointer) +
-  'prev_window' (pointer) +
-  'next_window' (pointer) |
+  'scroll' (pointer, hdata: 'window_scroll') +
+  'ptr_tree' (pointer, hdata: 'window_tree') +
+  'prev_window' (pointer, hdata: 'window') +
+  'next_window' (pointer, hdata: 'window') |
   'gui_current_window' +
   'gui_windows' +
   'last_gui_window'
 
 | weechat | window_scroll | Scroll-Info in Fenstern |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'first_line_displayed' (integer) +
-  'start_line' (pointer) +
+  'start_line' (pointer, hdata: 'line') +
   'start_line_pos' (integer) +
   'scrolling' (integer) +
   'start_col' (integer) +
   'lines_after' (integer) +
   'reset_allowed' (integer) +
-  'prev_scroll' (pointer) +
-  'next_scroll' (pointer) |
+  'prev_scroll' (pointer, hdata: 'window_scroll') +
+  'next_scroll' (pointer, hdata: 'window_scroll') |
   -
 
 | weechat | window_tree | Baumstruktur der Fenster |
-  'parent_node' (pointer) +
+  'parent_node' (pointer, hdata: 'window_tree') +
   'split_pct' (integer) +
   'split_horizontal' (integer) +
-  'child1' (pointer) +
-  'child2' (pointer) +
-  'window' (pointer) |
+  'child1' (pointer, hdata: 'window_tree') +
+  'child2' (pointer, hdata: 'window_tree') +
+  'window' (pointer, hdata: 'window') |
   'gui_windows_tree'
 
 |========================================
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index aa31b9561..71946230c 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -145,21 +145,22 @@ Erweiterung: Name der Erweiterung ('weechat' für interne WeeChat Befehle)
 /debug  list
         set <plugin> <level>
         dump [<plugin>]
-        buffer|color|hdata|infolists|memory|tags|term|windows
-
-     list: zeigt alle Erweiterungen mit Debuglevel an
-      set: setzt den Level der Protokollierung für eine Erweiterung
-   plugin: Name der Erweiterung ("core" für den WeeChat Kern)
-    level: Debuglevel der Erweiterung (0 = deaktiviert das Debug)
-     dump: Speicherabbild in die WeeChat Protokolldatei schreiben (wie bei einem Programmabsturz)
-   buffer: speichert den Bufferinhalt als hexadezimale Ausgabe in die Protokolldatei
-    color: zeigt Informationen über die aktuellen Farbpaarungen an
-    hdata: zeigt Informationen zu hdata an (direkter Daten-Zugriff auf WeeChat/Erweiterungen)
-infolists: zeigt Information über die Infolists an
-   memory: gibt Informationen über den genutzten Speicher aus
-     tags: zeigt für jede einzelne Zeile die dazugehörigen Tags an
-     term: gibt Informationen über das Terminal und verfügbare Farben aus
-  windows: zeigt die Fensterstruktur an
+        buffer|color|infolists|memory|tags|term|windows
+        hdata [free]
+
+     list: list plugins with debug levels
+      set: set debug level for plugin
+   plugin: name of plugin ("core" for WeeChat core)
+    level: debug level for plugin (0 = disable debug)
+     dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
+   buffer: dump buffer content with hexadecimal values in log file
+    color: display infos about current color pairs
+    hdata: display infos about hdata (with free: remove all hdata in memory)
+infolists: display infos about infolists
+   memory: display infos about memory usage
+     tags: display tags for lines
+     term: display infos about terminal
+  windows: display windows tree
 ........................................
 
 [command]*`filter`* Filterfunktion um Nachrichten in Buffern zu aus- oder einzublenden, dazu können Tags oder regulären Ausdrücken verwendet werden::
diff --git a/doc/docgen.pl b/doc/docgen.pl
index a3ba99910..45ecb63b4 100644
--- a/doc/docgen.pl
+++ b/doc/docgen.pl
@@ -332,7 +332,9 @@ sub get_hdata
                     my $type = int($value) >> 16;
                     my $offset = int($value) & 0xFFFF;
                     my $stroffset = sprintf("%08d", $offset);
-                    $hdata2{$stroffset} = "'".$key."' (".weechat::hdata_get_var_type_string($ptr_hdata, $key).")";
+                    my $var_hdata = weechat::hdata_get_var_hdata($ptr_hdata, $key);
+                    $var_hdata = ", hdata: '".$var_hdata."'" if ($var_hdata ne "");
+                    $hdata2{$stroffset} = "'".$key."' (".weechat::hdata_get_var_type_string($ptr_hdata, $key).$var_hdata.")";
                 }
                 foreach my $offset (sort keys %hdata2)
                 {
diff --git a/doc/en/autogen/plugin_api/hdata.txt b/doc/en/autogen/plugin_api/hdata.txt
index 09bfaa827..e6ff1fa15 100644
--- a/doc/en/autogen/plugin_api/hdata.txt
+++ b/doc/en/autogen/plugin_api/hdata.txt
@@ -19,22 +19,22 @@
   'pv_remote_nick_color' (string) +
   'hook_autorejoin' (pointer) +
   'nicks_count' (integer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
+  'nicks' (pointer, hdata: 'irc_nick') +
+  'last_nick' (pointer, hdata: 'irc_nick') +
   'nicks_speaking' (pointer) +
-  'nicks_speaking_time' (pointer) +
-  'last_nick_speaking_time' (pointer) +
-  'buffer' (pointer) +
+  'nicks_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'last_nick_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'prev_channel' (pointer) +
-  'next_channel' (pointer) |
+  'prev_channel' (pointer, hdata: 'irc_channel') +
+  'next_channel' (pointer, hdata: 'irc_channel') |
   -
 
 | irc | irc_channel_speaking | irc channel_speaking |
   'nick' (string) +
   'time_last_message' (time) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
+  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
   -
 
 | irc | irc_ignore | irc ignore |
@@ -43,8 +43,8 @@
   'regex_mask' (pointer) +
   'server' (string) +
   'channel' (string) +
-  'prev_ignore' (pointer) +
-  'next_ignore' (pointer) |
+  'prev_ignore' (pointer, hdata: 'irc_ignore') +
+  'next_ignore' (pointer, hdata: 'irc_ignore') |
   'irc_ignore_list' +
   'last_irc_ignore'
 
@@ -55,23 +55,23 @@
   'prefix' (string) +
   'away' (integer) +
   'color' (string) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_nick') +
+  'next_nick' (pointer, hdata: 'irc_nick') |
   -
 
 | irc | irc_notify | irc notify |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'nick' (string) +
   'check_away' (integer) +
   'is_on_server' (integer) +
   'away_message' (string) +
   'ison_received' (integer) +
-  'prev_notify' (pointer) +
-  'next_notify' (pointer) |
+  'prev_notify' (pointer, hdata: 'irc_notify') +
+  'next_notify' (pointer, hdata: 'irc_notify') |
   -
 
 | irc | irc_redirect | irc redirect |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'pattern' (string) +
   'signal' (string) +
   'count' (integer) +
@@ -88,8 +88,8 @@
   'cmd_filter' (pointer) +
   'output' (string) +
   'output_size' (integer) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect') +
+  'next_redirect' (pointer, hdata: 'irc_redirect') |
   -
 
 | irc | irc_redirect_pattern | pattern for irc redirect |
@@ -99,8 +99,8 @@
   'cmd_start' (string) +
   'cmd_stop' (string) +
   'cmd_extra' (string) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
+  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
   'irc_redirect_patterns' +
   'last_irc_redirect_pattern'
 
@@ -118,10 +118,10 @@
   'current_ip' (string) +
   'current_port' (integer) +
   'sock' (integer) +
-  'hook_connect' (pointer) +
-  'hook_fd' (pointer) +
-  'hook_timer_connection' (pointer) +
-  'hook_timer_sasl' (pointer) +
+  'hook_connect' (pointer, hdata: 'hook') +
+  'hook_fd' (pointer, hdata: 'hook') +
+  'hook_timer_connection' (pointer, hdata: 'hook') +
+  'hook_timer_sasl' (pointer, hdata: 'hook') +
   'is_connected' (integer) +
   'ssl_connected' (integer) +
   'gnutls_sess' (other) +
@@ -153,17 +153,17 @@
   'last_away_check' (time) +
   'outqueue' (pointer) +
   'last_outqueue' (pointer) +
-  'redirects' (pointer) +
-  'last_redirect' (pointer) +
-  'notify_list' (pointer) +
-  'last_notify' (pointer) +
+  'redirects' (pointer, hdata: 'irc_redirect') +
+  'last_redirect' (pointer, hdata: 'irc_redirect') +
+  'notify_list' (pointer, hdata: 'irc_notify') +
+  'last_notify' (pointer, hdata: 'irc_notify') +
   'manual_joins' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'channels' (pointer) +
-  'last_channel' (pointer) +
-  'prev_server' (pointer) +
-  'next_server' (pointer) |
+  'channels' (pointer, hdata: 'irc_channel') +
+  'last_channel' (pointer, hdata: 'irc_channel') +
+  'prev_server' (pointer, hdata: 'irc_server') +
+  'next_server' (pointer, hdata: 'irc_server') |
   'irc_servers' +
   'last_irc_server'
 
@@ -177,23 +177,23 @@
   'items_array' (pointer) +
   'bar_window' (pointer) +
   'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer) +
-  'next_bar' (pointer) |
+  'prev_bar' (pointer, hdata: 'bar') +
+  'next_bar' (pointer, hdata: 'bar') |
   'gui_bars' +
   'last_gui_bar'
 
 | weechat | bar_item | bar item |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'build_callback' (pointer) +
   'build_callback_data' (pointer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'bar_item') +
+  'next_item' (pointer, hdata: 'bar_item') |
   'gui_bar_items' +
   'last_gui_bar_item'
 
 | weechat | buffer | buffer |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'plugin_name_for_upgrade' (string) +
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
@@ -209,14 +209,14 @@
   'close_callback' (pointer) +
   'close_callback_data' (pointer) +
   'title' (string) +
-  'own_lines' (pointer) +
-  'mixed_lines' (pointer) +
-  'lines' (pointer) +
+  'own_lines' (pointer, hdata: 'lines') +
+  'mixed_lines' (pointer, hdata: 'lines') +
+  'lines' (pointer, hdata: 'lines') +
   'time_for_each_line' (integer) +
   'chat_refresh_needed' (integer) +
   'nicklist' (integer) +
   'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer) +
+  'nicklist_root' (pointer, hdata: 'nick_group') +
   'nicklist_max_length' (integer) +
   'nicklist_display_groups' (integer) +
   'nicklist_visible_count' (integer) +
@@ -230,15 +230,15 @@
   'input_buffer_length' (integer) +
   'input_buffer_pos' (integer) +
   'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer) +
-  'input_undo' (pointer) +
-  'last_input_undo' (pointer) +
-  'ptr_input_undo' (pointer) +
+  'input_undo_snap' (pointer, hdata: 'input_undo') +
+  'input_undo' (pointer, hdata: 'input_undo') +
+  'last_input_undo' (pointer, hdata: 'input_undo') +
+  'ptr_input_undo' (pointer, hdata: 'input_undo') +
   'input_undo_count' (integer) +
-  'completion' (pointer) +
-  'history' (pointer) +
-  'last_history' (pointer) +
-  'ptr_history' (pointer) +
+  'completion' (pointer, hdata: 'completion') +
+  'history' (pointer, hdata: 'history') +
+  'last_history' (pointer, hdata: 'history') +
+  'ptr_history' (pointer, hdata: 'history') +
   'num_history' (integer) +
   'text_search' (integer) +
   'text_search_exact' (integer) +
@@ -251,17 +251,17 @@
   'highlight_tags_count' (integer) +
   'highlight_tags_array' (pointer) +
   'hotlist_max_level_nicks' (pointer) +
-  'keys' (pointer) +
-  'last_key' (pointer) +
+  'keys' (pointer, hdata: 'key') +
+  'last_key' (pointer, hdata: 'key') +
   'keys_count' (integer) +
   'local_variables' (pointer) +
-  'prev_buffer' (pointer) +
-  'next_buffer' (pointer) |
+  'prev_buffer' (pointer, hdata: 'buffer') +
+  'next_buffer' (pointer, hdata: 'buffer') |
   'gui_buffers' +
   'last_gui_buffer'
 
 | weechat | completion | structure with completion |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'context' (integer) +
   'base_command' (string) +
   'base_command_arg_index' (integer) +
@@ -278,34 +278,34 @@
   'position_replace' (integer) +
   'diff_size' (integer) +
   'diff_length' (integer) +
-  'partial_completion_list' (pointer) +
-  'last_partial_completion' (pointer) |
+  'partial_completion_list' (pointer, hdata: 'completion_partial') +
+  'last_partial_completion' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | completion_partial | structure with partial completion |
   'word' (string) +
   'count' (integer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'completion_partial') +
+  'next_item' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | config_file | config file |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'filename' (string) +
   'file' (pointer) +
   'callback_reload' (pointer) +
   'callback_reload_data' (pointer) +
-  'sections' (pointer) +
-  'last_section' (pointer) +
-  'prev_config' (pointer) +
-  'next_config' (pointer) |
+  'sections' (pointer, hdata: 'config_section') +
+  'last_section' (pointer, hdata: 'config_section') +
+  'prev_config' (pointer, hdata: 'config_file') +
+  'next_config' (pointer, hdata: 'config_file') |
   'config_files' +
   'last_config_file'
 
 | weechat | config_option | config option |
-  'config_file' (pointer) +
-  'section' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
+  'section' (pointer, hdata: 'config_section') +
   'name' (string) +
   'type' (integer) +
   'description' (string) +
@@ -322,12 +322,12 @@
   'callback_delete' (pointer) +
   'callback_delete_data' (pointer) +
   'loaded' (integer) +
-  'prev_option' (pointer) +
-  'next_option' (pointer) |
+  'prev_option' (pointer, hdata: 'config_option') +
+  'next_option' (pointer, hdata: 'config_option') |
   -
 
 | weechat | config_section | config section |
-  'config_file' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
   'name' (string) +
   'user_can_add_options' (integer) +
   'user_can_delete_options' (integer) +
@@ -341,10 +341,10 @@
   'callback_create_option_data' (pointer) +
   'callback_delete_option' (pointer) +
   'callback_delete_option_data' (pointer) +
-  'options' (pointer) +
-  'last_option' (pointer) +
-  'prev_section' (pointer) +
-  'next_section' (pointer) |
+  'options' (pointer, hdata: 'config_option') +
+  'last_option' (pointer, hdata: 'config_option') +
+  'prev_section' (pointer, hdata: 'config_section') +
+  'next_section' (pointer, hdata: 'config_section') |
   -
 
 | weechat | filter | filter |
@@ -359,206 +359,42 @@
   'regex' (string) +
   'regex_prefix' (pointer) +
   'regex_message' (pointer) +
-  'prev_filter' (pointer) +
-  'next_filter' (pointer) |
+  'prev_filter' (pointer, hdata: 'filter') +
+  'next_filter' (pointer, hdata: 'filter') |
   'gui_filters' +
   'last_gui_filter'
 
 | weechat | history | history of commands in buffer |
   'text' (string) +
-  'next_history' (pointer) +
-  'prev_history' (pointer) |
+  'next_history' (pointer, hdata: 'history') +
+  'prev_history' (pointer, hdata: 'history') |
   -
 
-| weechat | hook | hook (variables common to all hook types) |
-  'plugin' (pointer) +
-  'type' (integer) +
-  'deleted' (integer) +
-  'running' (integer) +
-  'priority' (integer) +
-  'callback_data' (pointer) +
-  'hook_data' (pointer) +
-  'prev_hook' (pointer) +
-  'next_hook' (pointer) |
-  -
-
-| weechat | hook_command | hook of type "command" |
-  'callback' (pointer) +
-  'command' (string) +
-  'description' (string) +
-  'args' (string) +
-  'args_description' (string) +
-  'completion' (string) +
-  'cplt_num_templates' (integer) +
-  'cplt_templates' (pointer) +
-  'cplt_templates_static' (pointer) +
-  'cplt_template_num_args' (pointer) +
-  'cplt_template_args' (pointer) +
-  'cplt_template_num_args_concat' (integer) +
-  'cplt_template_args_concat' (pointer) |
-  'last_weechat_hook_command' +
-  'weechat_hooks_command'
-
-| weechat | hook_command_run | hook of type "command_run" |
-  'callback' (pointer) +
-  'command' (string) |
-  'last_weechat_hook_command_run' +
-  'weechat_hooks_command_run'
-
-| weechat | hook_completion | hook of type "completion" |
-  'callback' (pointer) +
-  'completion_item' (string) +
-  'description' (string) |
-  'last_weechat_hook_completion' +
-  'weechat_hooks_completion'
-
-| weechat | hook_config | hook of type "config" |
-  'callback' (pointer) +
-  'option' (string) |
-  'last_weechat_hook_config' +
-  'weechat_hooks_config'
-
-| weechat | hook_connect | hook of type "connect" |
-  'callback' (pointer) +
-  'proxy' (string) +
-  'address' (string) +
-  'port' (integer) +
-  'sock' (integer) +
-  'ipv6' (integer) +
-  'gnutls_sess' (pointer) +
-  'gnutls_cb' (pointer) +
-  'gnutls_dhkey_size' (integer) +
-  'gnutls_priorities' (string) +
-  'local_hostname' (string) +
-  'child_read' (integer) +
-  'child_write' (integer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'handshake_hook_fd' (pointer) +
-  'handshake_hook_timer' (pointer) +
-  'handshake_fd_flags' (integer) +
-  'handshake_ip_address' (string) |
-  'last_weechat_hook_connect' +
-  'weechat_hooks_connect'
-
-| weechat | hook_fd | hook of type "fd" |
-  'callback' (pointer) +
-  'fd' (integer) +
-  'flags' (integer) +
-  'error' (integer) |
-  'last_weechat_hook_fd' +
-  'weechat_hooks_fd'
-
-| weechat | hook_hdata | hook of type "hdata" |
-  'callback' (pointer) +
-  'hdata_name' (string) +
-  'description' (string) |
-  'last_weechat_hook_hdata' +
-  'weechat_hooks_hdata'
-
-| weechat | hook_hsignal | hook of type "hsignal" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_hsignal' +
-  'weechat_hooks_hsignal'
-
-| weechat | hook_info | hook of type "info" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_info' +
-  'weechat_hooks_info'
-
-| weechat | hook_info_hashtable | hook of type "info_hashtable" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) +
-  'output_description' (string) |
-  'last_weechat_hook_info_hashtable' +
-  'weechat_hooks_info_hashtable'
-
-| weechat | hook_infolist | hook of type "infolist" |
-  'callback' (pointer) +
-  'infolist_name' (string) +
-  'description' (string) +
-  'pointer_description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_infolist' +
-  'weechat_hooks_infolist'
-
-| weechat | hook_modifier | hook of type "modifier" |
-  'callback' (pointer) +
-  'modifier' (string) |
-  'last_weechat_hook_modifier' +
-  'weechat_hooks_modifier'
-
-| weechat | hook_print | hook of type "print" |
-  'callback' (pointer) +
-  'buffer' (pointer) +
-  'tags_count' (integer) +
-  'tags_array' (pointer) +
-  'message' (string) +
-  'strip_colors' (integer) |
-  'last_weechat_hook_print' +
-  'weechat_hooks_print'
-
-| weechat | hook_process | hook of type "process" |
-  'callback' (pointer) +
-  'command' (string) +
-  'timeout' (long) +
-  'child_read' (pointer) +
-  'child_write' (pointer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'hook_timer' (pointer) +
-  'buffer' (pointer) +
-  'buffer_size' (pointer) |
-  'last_weechat_hook_process' +
-  'weechat_hooks_process'
-
-| weechat | hook_signal | hook of type "signal" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_signal' +
-  'weechat_hooks_signal'
-
-| weechat | hook_timer | hook of type "timer" |
-  'callback' (pointer) +
-  'interval' (long) +
-  'align_second' (integer) +
-  'remaining_calls' (integer) +
-  'last_exec' (other) +
-  'next_exec' (other) |
-  'last_weechat_hook_timer' +
-  'weechat_hooks_timer'
-
 | weechat | input_undo | structure with undo for input line |
   'data' (string) +
   'pos' (integer) +
-  'prev_undo' (pointer) +
-  'next_undo' (pointer) |
+  'prev_undo' (pointer, hdata: 'input_undo') +
+  'next_undo' (pointer, hdata: 'input_undo') |
   -
 
 | weechat | key | a key (keyboard shortcut) |
   'key' (string) +
   'command' (string) +
-  'prev_key' (pointer) +
-  'next_key' (pointer) |
+  'prev_key' (pointer, hdata: 'key') +
+  'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +
   'gui_keys' +
   'last_gui_default_key' +
   'last_gui_key'
 
 | weechat | line | structure with one line |
-  'data' (pointer) +
-  'prev_line' (pointer) +
-  'next_line' (pointer) |
+  'data' (pointer, hdata: 'line_data') +
+  'prev_line' (pointer, hdata: 'line') +
+  'next_line' (pointer, hdata: 'line') |
   -
 
 | weechat | line_data | structure with one line data |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'y' (integer) +
   'date' (time) +
   'date_printed' (time) +
@@ -574,9 +410,9 @@
   -
 
 | weechat | lines | structure with lines |
-  'first_line' (pointer) +
-  'last_line' (pointer) +
-  'last_read_line' (pointer) +
+  'first_line' (pointer, hdata: 'line') +
+  'last_line' (pointer, hdata: 'line') +
+  'last_read_line' (pointer, hdata: 'line') +
   'lines_count' (integer) +
   'first_line_not_read' (integer) +
   'lines_hidden' (integer) +
@@ -585,14 +421,14 @@
   -
 
 | weechat | nick | nick in nicklist |
-  'group' (pointer) +
+  'group' (pointer, hdata: 'nick_group') +
   'name' (string) +
   'color' (string) +
   'prefix' (string) +
   'prefix_color' (string) +
   'visible' (integer) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'nick') +
+  'next_nick' (pointer, hdata: 'nick') |
   -
 
 | weechat | nick_group | group in nicklist |
@@ -600,15 +436,30 @@
   'color' (string) +
   'visible' (integer) +
   'level' (integer) +
-  'parent' (pointer) +
-  'childs' (pointer) +
-  'last_child' (pointer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
-  'prev_group' (pointer) +
-  'next_group' (pointer) |
+  'parent' (pointer, hdata: 'nick_group') +
+  'childs' (pointer, hdata: 'nick_group') +
+  'last_child' (pointer, hdata: 'nick_group') +
+  'nicks' (pointer, hdata: 'nick') +
+  'last_nick' (pointer, hdata: 'nick') +
+  'prev_group' (pointer, hdata: 'nick_group') +
+  'next_group' (pointer, hdata: 'nick_group') |
   -
 
+| weechat | plugin | plugin |
+  'filename' (string) +
+  'handle' (pointer) +
+  'name' (string) +
+  'description' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'charset' (string) +
+  'debug' (integer) +
+  'prev_plugin' (pointer, hdata: 'plugin') +
+  'next_plugin' (pointer, hdata: 'plugin') |
+  'last_weechat_plugin' +
+  'weechat_plugins'
+
 | weechat | window | window |
   'win_x' (integer) +
   'win_y' (integer) +
@@ -626,37 +477,37 @@
   'last_bar_window' (pointer) +
   'refresh_needed' (integer) +
   'gui_objects' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'layout_plugin_name' (string) +
   'layout_buffer_name' (string) +
-  'scroll' (pointer) +
-  'ptr_tree' (pointer) +
-  'prev_window' (pointer) +
-  'next_window' (pointer) |
+  'scroll' (pointer, hdata: 'window_scroll') +
+  'ptr_tree' (pointer, hdata: 'window_tree') +
+  'prev_window' (pointer, hdata: 'window') +
+  'next_window' (pointer, hdata: 'window') |
   'gui_current_window' +
   'gui_windows' +
   'last_gui_window'
 
 | weechat | window_scroll | scroll info in window |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'first_line_displayed' (integer) +
-  'start_line' (pointer) +
+  'start_line' (pointer, hdata: 'line') +
   'start_line_pos' (integer) +
   'scrolling' (integer) +
   'start_col' (integer) +
   'lines_after' (integer) +
   'reset_allowed' (integer) +
-  'prev_scroll' (pointer) +
-  'next_scroll' (pointer) |
+  'prev_scroll' (pointer, hdata: 'window_scroll') +
+  'next_scroll' (pointer, hdata: 'window_scroll') |
   -
 
 | weechat | window_tree | tree of windows |
-  'parent_node' (pointer) +
+  'parent_node' (pointer, hdata: 'window_tree') +
   'split_pct' (integer) +
   'split_horizontal' (integer) +
-  'child1' (pointer) +
-  'child2' (pointer) +
-  'window' (pointer) |
+  'child1' (pointer, hdata: 'window_tree') +
+  'child2' (pointer, hdata: 'window_tree') +
+  'window' (pointer, hdata: 'window') |
   'gui_windows_tree'
 
 |========================================
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index edac790da..7a3fb70ee 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -145,7 +145,8 @@ command: command to execute (a '/' is automatically added if not found at beginn
 /debug  list
         set <plugin> <level>
         dump [<plugin>]
-        buffer|color|hdata|infolists|memory|tags|term|windows
+        buffer|color|infolists|memory|tags|term|windows
+        hdata [free]
 
      list: list plugins with debug levels
       set: set debug level for plugin
@@ -154,7 +155,7 @@ command: command to execute (a '/' is automatically added if not found at beginn
      dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
    buffer: dump buffer content with hexadecimal values in log file
     color: display infos about current color pairs
-    hdata: display infos about hdata
+    hdata: display infos about hdata (with free: remove all hdata in memory)
 infolists: display infos about infolists
    memory: display infos about memory usage
      tags: display tags for lines
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index 8628b6e46..c6e77ce8c 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -11686,7 +11686,8 @@ Prototype:
 
 [source,C]
 ----------------------------------------
-void weechat_hdata_new_var (struct t_hdata *hdata, const char *name, int offset, int type);
+void weechat_hdata_new_var (struct t_hdata *hdata, const char *name, int offset, int type,
+                            const char *hdata_name);
 ----------------------------------------
 
 Arguments:
@@ -11701,6 +11702,7 @@ Arguments:
 ** WEECHAT_HDATA_POINTER
 ** WEECHAT_HDATA_TIME
 ** WEECHAT_HDATA_OTHER
+* 'hdata_name': name of a hdata (if it's a pointer to a structure with hdata)
 
 C example:
 
@@ -11718,22 +11720,22 @@ struct t_myplugin_list
 /* ... */
 
 struct t_hdata *hdata = weechat_hdata_new ("myplugin_list", "prev", "next");
-weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING);
-weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER);
-weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER);
+weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING, NULL);
+weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER, NULL);
+weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER, NULL);
+weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER, "myplugin_list");
+weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER, "myplugin_list");
 ----------------------------------------
 
 The macro "WEECHAT_HDATA_VAR" can be used to shorten code:
 
 [source,C]
 ----------------------------------------
-WEECHAT_HDATA_VAR(struct t_myplugin_list, name, STRING);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, buffer, POINTER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, count, INTEGER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, prev, POINTER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, next, POINTER);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, name, STRING, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, buffer, POINTER, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, count, INTEGER, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, prev, POINTER, "myplugin_list");
+WEECHAT_HDATA_VAR(struct t_myplugin_list, next, POINTER, "myplugin_list");
 ----------------------------------------
 
 [NOTE]
@@ -11778,11 +11780,11 @@ struct t_myplugin_list *last_buffer = NULL;
 /* ... */
 
 struct t_hdata *hdata = weechat_hdata_new ("myplugin_list", "prev", "next");
-weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING);
-weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER);
-weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER);
+weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING, NULL);
+weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER, NULL);
+weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER, NULL);
+weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER, "myplugin_list");
+weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER, "myplugin_list");
 weechat_hdata_new_list (hdata, "buffers", &buffers);
 weechat_hdata_new_list (hdata, "last_buffer", &last_buffer);
 ----------------------------------------
@@ -11961,8 +11963,7 @@ C example:
 
 [source,C]
 ----------------------------------------
-weechat_printf (NULL, "type = %s",
-                weechat_hdata_get_var_type_string (hdata, "name"));
+weechat_printf (NULL, "type = %s", weechat_hdata_get_var_type_string (hdata, "name"));
 ----------------------------------------
 
 Script (Python):
@@ -11976,6 +11977,47 @@ type = weechat.hdata_get_var_type_string(hdata, name)
 weechat.prnt("", "type = %s" % weechat.hdata_get_var_type_string("name"))
 ----------------------------------------
 
+weechat_hdata_get_var_hdata
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_New in version 0.3.6._
+
+Return hdata for a variable in hdata.
+
+Prototype:
+
+[source,C]
+----------------------------------------
+const char *weechat_hdata_get_var_hdata (struct t_hdata *hdata, const char *name);
+----------------------------------------
+
+Arguments:
+
+* 'hdata': hdata pointer
+* 'name': variable name
+
+Return value:
+
+* hdata for variable, NULL if no hdata or if an error occured
+
+C example:
+
+[source,C]
+----------------------------------------
+weechat_printf (NULL, "hdata = %s", weechat_hdata_get_var_hdata (hdata, "name"));
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototype
+hdata_name = weechat.hdata_get_var_hdata(hdata, name)
+
+# example
+weechat.prnt("", "hdata = %s" % weechat.hdata_get_var_hdata(hdata, "name"))
+----------------------------------------
+
 weechat_hdata_get_var
 ^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/doc/fr/autogen/plugin_api/hdata.txt b/doc/fr/autogen/plugin_api/hdata.txt
index 67b770070..8bff8c1b6 100644
--- a/doc/fr/autogen/plugin_api/hdata.txt
+++ b/doc/fr/autogen/plugin_api/hdata.txt
@@ -19,22 +19,22 @@
   'pv_remote_nick_color' (string) +
   'hook_autorejoin' (pointer) +
   'nicks_count' (integer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
+  'nicks' (pointer, hdata: 'irc_nick') +
+  'last_nick' (pointer, hdata: 'irc_nick') +
   'nicks_speaking' (pointer) +
-  'nicks_speaking_time' (pointer) +
-  'last_nick_speaking_time' (pointer) +
-  'buffer' (pointer) +
+  'nicks_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'last_nick_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'prev_channel' (pointer) +
-  'next_channel' (pointer) |
+  'prev_channel' (pointer, hdata: 'irc_channel') +
+  'next_channel' (pointer, hdata: 'irc_channel') |
   -
 
 | irc | irc_channel_speaking | channel_speaking irc |
   'nick' (string) +
   'time_last_message' (time) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
+  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
   -
 
 | irc | irc_ignore | ignore irc |
@@ -43,8 +43,8 @@
   'regex_mask' (pointer) +
   'server' (string) +
   'channel' (string) +
-  'prev_ignore' (pointer) +
-  'next_ignore' (pointer) |
+  'prev_ignore' (pointer, hdata: 'irc_ignore') +
+  'next_ignore' (pointer, hdata: 'irc_ignore') |
   'irc_ignore_list' +
   'last_irc_ignore'
 
@@ -55,23 +55,23 @@
   'prefix' (string) +
   'away' (integer) +
   'color' (string) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_nick') +
+  'next_nick' (pointer, hdata: 'irc_nick') |
   -
 
 | irc | irc_notify | notify irc |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'nick' (string) +
   'check_away' (integer) +
   'is_on_server' (integer) +
   'away_message' (string) +
   'ison_received' (integer) +
-  'prev_notify' (pointer) +
-  'next_notify' (pointer) |
+  'prev_notify' (pointer, hdata: 'irc_notify') +
+  'next_notify' (pointer, hdata: 'irc_notify') |
   -
 
 | irc | irc_redirect | redirection irc |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'pattern' (string) +
   'signal' (string) +
   'count' (integer) +
@@ -88,8 +88,8 @@
   'cmd_filter' (pointer) +
   'output' (string) +
   'output_size' (integer) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect') +
+  'next_redirect' (pointer, hdata: 'irc_redirect') |
   -
 
 | irc | irc_redirect_pattern | modèle pour une redirection irc |
@@ -99,8 +99,8 @@
   'cmd_start' (string) +
   'cmd_stop' (string) +
   'cmd_extra' (string) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
+  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
   'irc_redirect_patterns' +
   'last_irc_redirect_pattern'
 
@@ -118,10 +118,10 @@
   'current_ip' (string) +
   'current_port' (integer) +
   'sock' (integer) +
-  'hook_connect' (pointer) +
-  'hook_fd' (pointer) +
-  'hook_timer_connection' (pointer) +
-  'hook_timer_sasl' (pointer) +
+  'hook_connect' (pointer, hdata: 'hook') +
+  'hook_fd' (pointer, hdata: 'hook') +
+  'hook_timer_connection' (pointer, hdata: 'hook') +
+  'hook_timer_sasl' (pointer, hdata: 'hook') +
   'is_connected' (integer) +
   'ssl_connected' (integer) +
   'gnutls_sess' (other) +
@@ -153,17 +153,17 @@
   'last_away_check' (time) +
   'outqueue' (pointer) +
   'last_outqueue' (pointer) +
-  'redirects' (pointer) +
-  'last_redirect' (pointer) +
-  'notify_list' (pointer) +
-  'last_notify' (pointer) +
+  'redirects' (pointer, hdata: 'irc_redirect') +
+  'last_redirect' (pointer, hdata: 'irc_redirect') +
+  'notify_list' (pointer, hdata: 'irc_notify') +
+  'last_notify' (pointer, hdata: 'irc_notify') +
   'manual_joins' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'channels' (pointer) +
-  'last_channel' (pointer) +
-  'prev_server' (pointer) +
-  'next_server' (pointer) |
+  'channels' (pointer, hdata: 'irc_channel') +
+  'last_channel' (pointer, hdata: 'irc_channel') +
+  'prev_server' (pointer, hdata: 'irc_server') +
+  'next_server' (pointer, hdata: 'irc_server') |
   'irc_servers' +
   'last_irc_server'
 
@@ -177,23 +177,23 @@
   'items_array' (pointer) +
   'bar_window' (pointer) +
   'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer) +
-  'next_bar' (pointer) |
+  'prev_bar' (pointer, hdata: 'bar') +
+  'next_bar' (pointer, hdata: 'bar') |
   'gui_bars' +
   'last_gui_bar'
 
 | weechat | bar_item | objet de barre |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'build_callback' (pointer) +
   'build_callback_data' (pointer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'bar_item') +
+  'next_item' (pointer, hdata: 'bar_item') |
   'gui_bar_items' +
   'last_gui_bar_item'
 
 | weechat | buffer | tampon |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'plugin_name_for_upgrade' (string) +
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
@@ -209,14 +209,14 @@
   'close_callback' (pointer) +
   'close_callback_data' (pointer) +
   'title' (string) +
-  'own_lines' (pointer) +
-  'mixed_lines' (pointer) +
-  'lines' (pointer) +
+  'own_lines' (pointer, hdata: 'lines') +
+  'mixed_lines' (pointer, hdata: 'lines') +
+  'lines' (pointer, hdata: 'lines') +
   'time_for_each_line' (integer) +
   'chat_refresh_needed' (integer) +
   'nicklist' (integer) +
   'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer) +
+  'nicklist_root' (pointer, hdata: 'nick_group') +
   'nicklist_max_length' (integer) +
   'nicklist_display_groups' (integer) +
   'nicklist_visible_count' (integer) +
@@ -230,15 +230,15 @@
   'input_buffer_length' (integer) +
   'input_buffer_pos' (integer) +
   'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer) +
-  'input_undo' (pointer) +
-  'last_input_undo' (pointer) +
-  'ptr_input_undo' (pointer) +
+  'input_undo_snap' (pointer, hdata: 'input_undo') +
+  'input_undo' (pointer, hdata: 'input_undo') +
+  'last_input_undo' (pointer, hdata: 'input_undo') +
+  'ptr_input_undo' (pointer, hdata: 'input_undo') +
   'input_undo_count' (integer) +
-  'completion' (pointer) +
-  'history' (pointer) +
-  'last_history' (pointer) +
-  'ptr_history' (pointer) +
+  'completion' (pointer, hdata: 'completion') +
+  'history' (pointer, hdata: 'history') +
+  'last_history' (pointer, hdata: 'history') +
+  'ptr_history' (pointer, hdata: 'history') +
   'num_history' (integer) +
   'text_search' (integer) +
   'text_search_exact' (integer) +
@@ -251,17 +251,17 @@
   'highlight_tags_count' (integer) +
   'highlight_tags_array' (pointer) +
   'hotlist_max_level_nicks' (pointer) +
-  'keys' (pointer) +
-  'last_key' (pointer) +
+  'keys' (pointer, hdata: 'key') +
+  'last_key' (pointer, hdata: 'key') +
   'keys_count' (integer) +
   'local_variables' (pointer) +
-  'prev_buffer' (pointer) +
-  'next_buffer' (pointer) |
+  'prev_buffer' (pointer, hdata: 'buffer') +
+  'next_buffer' (pointer, hdata: 'buffer') |
   'gui_buffers' +
   'last_gui_buffer'
 
 | weechat | completion | structure avec une complétion |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'context' (integer) +
   'base_command' (string) +
   'base_command_arg_index' (integer) +
@@ -278,34 +278,34 @@
   'position_replace' (integer) +
   'diff_size' (integer) +
   'diff_length' (integer) +
-  'partial_completion_list' (pointer) +
-  'last_partial_completion' (pointer) |
+  'partial_completion_list' (pointer, hdata: 'completion_partial') +
+  'last_partial_completion' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | completion_partial | structure avec une complétion partielle |
   'word' (string) +
   'count' (integer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'completion_partial') +
+  'next_item' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | config_file | fichier de configuration |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'filename' (string) +
   'file' (pointer) +
   'callback_reload' (pointer) +
   'callback_reload_data' (pointer) +
-  'sections' (pointer) +
-  'last_section' (pointer) +
-  'prev_config' (pointer) +
-  'next_config' (pointer) |
+  'sections' (pointer, hdata: 'config_section') +
+  'last_section' (pointer, hdata: 'config_section') +
+  'prev_config' (pointer, hdata: 'config_file') +
+  'next_config' (pointer, hdata: 'config_file') |
   'config_files' +
   'last_config_file'
 
 | weechat | config_option | option de configuration |
-  'config_file' (pointer) +
-  'section' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
+  'section' (pointer, hdata: 'config_section') +
   'name' (string) +
   'type' (integer) +
   'description' (string) +
@@ -322,12 +322,12 @@
   'callback_delete' (pointer) +
   'callback_delete_data' (pointer) +
   'loaded' (integer) +
-  'prev_option' (pointer) +
-  'next_option' (pointer) |
+  'prev_option' (pointer, hdata: 'config_option') +
+  'next_option' (pointer, hdata: 'config_option') |
   -
 
 | weechat | config_section | section de configuration |
-  'config_file' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
   'name' (string) +
   'user_can_add_options' (integer) +
   'user_can_delete_options' (integer) +
@@ -341,10 +341,10 @@
   'callback_create_option_data' (pointer) +
   'callback_delete_option' (pointer) +
   'callback_delete_option_data' (pointer) +
-  'options' (pointer) +
-  'last_option' (pointer) +
-  'prev_section' (pointer) +
-  'next_section' (pointer) |
+  'options' (pointer, hdata: 'config_option') +
+  'last_option' (pointer, hdata: 'config_option') +
+  'prev_section' (pointer, hdata: 'config_section') +
+  'next_section' (pointer, hdata: 'config_section') |
   -
 
 | weechat | filter | filtre |
@@ -359,206 +359,42 @@
   'regex' (string) +
   'regex_prefix' (pointer) +
   'regex_message' (pointer) +
-  'prev_filter' (pointer) +
-  'next_filter' (pointer) |
+  'prev_filter' (pointer, hdata: 'filter') +
+  'next_filter' (pointer, hdata: 'filter') |
   'gui_filters' +
   'last_gui_filter'
 
 | weechat | history | historique des commandes dans le tampon |
   'text' (string) +
-  'next_history' (pointer) +
-  'prev_history' (pointer) |
+  'next_history' (pointer, hdata: 'history') +
+  'prev_history' (pointer, hdata: 'history') |
   -
 
-| weechat | hook | hook (variables communes à tous les types de hooks) |
-  'plugin' (pointer) +
-  'type' (integer) +
-  'deleted' (integer) +
-  'running' (integer) +
-  'priority' (integer) +
-  'callback_data' (pointer) +
-  'hook_data' (pointer) +
-  'prev_hook' (pointer) +
-  'next_hook' (pointer) |
-  -
-
-| weechat | hook_command | hook de type "command" |
-  'callback' (pointer) +
-  'command' (string) +
-  'description' (string) +
-  'args' (string) +
-  'args_description' (string) +
-  'completion' (string) +
-  'cplt_num_templates' (integer) +
-  'cplt_templates' (pointer) +
-  'cplt_templates_static' (pointer) +
-  'cplt_template_num_args' (pointer) +
-  'cplt_template_args' (pointer) +
-  'cplt_template_num_args_concat' (integer) +
-  'cplt_template_args_concat' (pointer) |
-  'last_weechat_hook_command' +
-  'weechat_hooks_command'
-
-| weechat | hook_command_run | hook de type "command_run" |
-  'callback' (pointer) +
-  'command' (string) |
-  'last_weechat_hook_command_run' +
-  'weechat_hooks_command_run'
-
-| weechat | hook_completion | hook de type "completion" |
-  'callback' (pointer) +
-  'completion_item' (string) +
-  'description' (string) |
-  'last_weechat_hook_completion' +
-  'weechat_hooks_completion'
-
-| weechat | hook_config | hook de type "config" |
-  'callback' (pointer) +
-  'option' (string) |
-  'last_weechat_hook_config' +
-  'weechat_hooks_config'
-
-| weechat | hook_connect | hook de type "connect" |
-  'callback' (pointer) +
-  'proxy' (string) +
-  'address' (string) +
-  'port' (integer) +
-  'sock' (integer) +
-  'ipv6' (integer) +
-  'gnutls_sess' (pointer) +
-  'gnutls_cb' (pointer) +
-  'gnutls_dhkey_size' (integer) +
-  'gnutls_priorities' (string) +
-  'local_hostname' (string) +
-  'child_read' (integer) +
-  'child_write' (integer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'handshake_hook_fd' (pointer) +
-  'handshake_hook_timer' (pointer) +
-  'handshake_fd_flags' (integer) +
-  'handshake_ip_address' (string) |
-  'last_weechat_hook_connect' +
-  'weechat_hooks_connect'
-
-| weechat | hook_fd | hook de type "fd" |
-  'callback' (pointer) +
-  'fd' (integer) +
-  'flags' (integer) +
-  'error' (integer) |
-  'last_weechat_hook_fd' +
-  'weechat_hooks_fd'
-
-| weechat | hook_hdata | hook de type "hdata" |
-  'callback' (pointer) +
-  'hdata_name' (string) +
-  'description' (string) |
-  'last_weechat_hook_hdata' +
-  'weechat_hooks_hdata'
-
-| weechat | hook_hsignal | hook de type "hsignal" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_hsignal' +
-  'weechat_hooks_hsignal'
-
-| weechat | hook_info | hook de type "info" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_info' +
-  'weechat_hooks_info'
-
-| weechat | hook_info_hashtable | hook de type "info_hashtable" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) +
-  'output_description' (string) |
-  'last_weechat_hook_info_hashtable' +
-  'weechat_hooks_info_hashtable'
-
-| weechat | hook_infolist | hook de type "infolist" |
-  'callback' (pointer) +
-  'infolist_name' (string) +
-  'description' (string) +
-  'pointer_description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_infolist' +
-  'weechat_hooks_infolist'
-
-| weechat | hook_modifier | hook de type "modifier" |
-  'callback' (pointer) +
-  'modifier' (string) |
-  'last_weechat_hook_modifier' +
-  'weechat_hooks_modifier'
-
-| weechat | hook_print | hook de type "print" |
-  'callback' (pointer) +
-  'buffer' (pointer) +
-  'tags_count' (integer) +
-  'tags_array' (pointer) +
-  'message' (string) +
-  'strip_colors' (integer) |
-  'last_weechat_hook_print' +
-  'weechat_hooks_print'
-
-| weechat | hook_process | hook de type "process" |
-  'callback' (pointer) +
-  'command' (string) +
-  'timeout' (long) +
-  'child_read' (pointer) +
-  'child_write' (pointer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'hook_timer' (pointer) +
-  'buffer' (pointer) +
-  'buffer_size' (pointer) |
-  'last_weechat_hook_process' +
-  'weechat_hooks_process'
-
-| weechat | hook_signal | hook de type "signal" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_signal' +
-  'weechat_hooks_signal'
-
-| weechat | hook_timer | hook de type "timer" |
-  'callback' (pointer) +
-  'interval' (long) +
-  'align_second' (integer) +
-  'remaining_calls' (integer) +
-  'last_exec' (other) +
-  'next_exec' (other) |
-  'last_weechat_hook_timer' +
-  'weechat_hooks_timer'
-
-| weechat | input_undo | structure avec le "unco" pour la ligne de commande |
+| weechat | input_undo | structure avec le "undo" pour la ligne de commande |
   'data' (string) +
   'pos' (integer) +
-  'prev_undo' (pointer) +
-  'next_undo' (pointer) |
+  'prev_undo' (pointer, hdata: 'input_undo') +
+  'next_undo' (pointer, hdata: 'input_undo') |
   -
 
 | weechat | key | une touche (un raccourci clavier) |
   'key' (string) +
   'command' (string) +
-  'prev_key' (pointer) +
-  'next_key' (pointer) |
+  'prev_key' (pointer, hdata: 'key') +
+  'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +
   'gui_keys' +
   'last_gui_default_key' +
   'last_gui_key'
 
 | weechat | line | structure avec une ligne |
-  'data' (pointer) +
-  'prev_line' (pointer) +
-  'next_line' (pointer) |
+  'data' (pointer, hdata: 'line_data') +
+  'prev_line' (pointer, hdata: 'line') +
+  'next_line' (pointer, hdata: 'line') |
   -
 
 | weechat | line_data | structure avec les données d'une ligne |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'y' (integer) +
   'date' (time) +
   'date_printed' (time) +
@@ -574,9 +410,9 @@
   -
 
 | weechat | lines | structure avec des lignes |
-  'first_line' (pointer) +
-  'last_line' (pointer) +
-  'last_read_line' (pointer) +
+  'first_line' (pointer, hdata: 'line') +
+  'last_line' (pointer, hdata: 'line') +
+  'last_read_line' (pointer, hdata: 'line') +
   'lines_count' (integer) +
   'first_line_not_read' (integer) +
   'lines_hidden' (integer) +
@@ -585,14 +421,14 @@
   -
 
 | weechat | nick | pseudo dans la liste de pseudos |
-  'group' (pointer) +
+  'group' (pointer, hdata: 'nick_group') +
   'name' (string) +
   'color' (string) +
   'prefix' (string) +
   'prefix_color' (string) +
   'visible' (integer) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'nick') +
+  'next_nick' (pointer, hdata: 'nick') |
   -
 
 | weechat | nick_group | groupe dans la liste de pseudos |
@@ -600,15 +436,30 @@
   'color' (string) +
   'visible' (integer) +
   'level' (integer) +
-  'parent' (pointer) +
-  'childs' (pointer) +
-  'last_child' (pointer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
-  'prev_group' (pointer) +
-  'next_group' (pointer) |
+  'parent' (pointer, hdata: 'nick_group') +
+  'childs' (pointer, hdata: 'nick_group') +
+  'last_child' (pointer, hdata: 'nick_group') +
+  'nicks' (pointer, hdata: 'nick') +
+  'last_nick' (pointer, hdata: 'nick') +
+  'prev_group' (pointer, hdata: 'nick_group') +
+  'next_group' (pointer, hdata: 'nick_group') |
   -
 
+| weechat | plugin | extension |
+  'filename' (string) +
+  'handle' (pointer) +
+  'name' (string) +
+  'description' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'charset' (string) +
+  'debug' (integer) +
+  'prev_plugin' (pointer, hdata: 'plugin') +
+  'next_plugin' (pointer, hdata: 'plugin') |
+  'last_weechat_plugin' +
+  'weechat_plugins'
+
 | weechat | window | fenêtre |
   'win_x' (integer) +
   'win_y' (integer) +
@@ -626,37 +477,37 @@
   'last_bar_window' (pointer) +
   'refresh_needed' (integer) +
   'gui_objects' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'layout_plugin_name' (string) +
   'layout_buffer_name' (string) +
-  'scroll' (pointer) +
-  'ptr_tree' (pointer) +
-  'prev_window' (pointer) +
-  'next_window' (pointer) |
+  'scroll' (pointer, hdata: 'window_scroll') +
+  'ptr_tree' (pointer, hdata: 'window_tree') +
+  'prev_window' (pointer, hdata: 'window') +
+  'next_window' (pointer, hdata: 'window') |
   'gui_current_window' +
   'gui_windows' +
   'last_gui_window'
 
 | weechat | window_scroll | info de défilement dans la fenêtre |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'first_line_displayed' (integer) +
-  'start_line' (pointer) +
+  'start_line' (pointer, hdata: 'line') +
   'start_line_pos' (integer) +
   'scrolling' (integer) +
   'start_col' (integer) +
   'lines_after' (integer) +
   'reset_allowed' (integer) +
-  'prev_scroll' (pointer) +
-  'next_scroll' (pointer) |
+  'prev_scroll' (pointer, hdata: 'window_scroll') +
+  'next_scroll' (pointer, hdata: 'window_scroll') |
   -
 
 | weechat | window_tree | arbre des fenêtres |
-  'parent_node' (pointer) +
+  'parent_node' (pointer, hdata: 'window_tree') +
   'split_pct' (integer) +
   'split_horizontal' (integer) +
-  'child1' (pointer) +
-  'child2' (pointer) +
-  'window' (pointer) |
+  'child1' (pointer, hdata: 'window_tree') +
+  'child2' (pointer, hdata: 'window_tree') +
+  'window' (pointer, hdata: 'window') |
   'gui_windows_tree'
 
 |========================================
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index 4417483bc..bdccaa1b3 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -145,7 +145,8 @@ extension: nom de l'extension ('weechat' pour une commande interne WeeChat)
 /debug  list
         set <extension> <niveau>
         dump [<extension>]
-        buffer|color|hdata|infolists|memory|tags|term|windows
+        buffer|color|infolists|memory|tags|term|windows
+        hdata [free]
 
      list: lister les extensions avec leur niveau de debug
       set: définir le niveau de debug pour l'extension
@@ -154,7 +155,7 @@ extension: nom de l'extension ("core" pour le coeur de WeeChat)
      dump: afficher les variables mémoire WeeChat dans le fichier log (les mêmes messages sont affichés lorsque WeeChat plante)
    buffer: afficher le contenu du tampon en valeurs hexadécimales dans le fichier log
     color: afficher des infos sur les paires de couleur courantes
-    hdata: afficher des infos sur les hdata
+    hdata: afficher des infos sur les hdata (avec free: supprimer tous les hdata en mémoire)
 infolists: afficher des infos sur les infolists
    memory: afficher des infos sur l'utilisation de la mémoire
      tags: afficher les étiquettes pour les lignes
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index 0b5ec9b72..ab804fe3d 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -11877,7 +11877,8 @@ Prototype :
 
 [source,C]
 ----------------------------------------
-void weechat_hdata_new_var (struct t_hdata *hdata, const char *name, int offset, int type);
+void weechat_hdata_new_var (struct t_hdata *hdata, const char *name, int offset, int type,
+                            const char *hdata_name);
 ----------------------------------------
 
 Paramètres :
@@ -11892,6 +11893,8 @@ Paramètres :
 ** WEECHAT_HDATA_POINTER
 ** WEECHAT_HDATA_TIME
 ** WEECHAT_HDATA_OTHER
+* 'hdata_name' : nom d'un hdata (si c'est un pointeur vers une structure qui a un
+  hdata)
 
 Exemple en C :
 
@@ -11909,22 +11912,22 @@ struct t_myplugin_list
 /* ... */
 
 struct t_hdata *hdata = weechat_hdata_new ("myplugin_list", "prev", "next");
-weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING);
-weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER);
-weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER);
+weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING, NULL);
+weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER, NULL);
+weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER, NULL);
+weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER, "myplugin_list");
+weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER, "myplugin_list");
 ----------------------------------------
 
 La macro "WEECHAT_HDATA_VAR" peut être utilisée pour raccourcir le code :
 
 [source,C]
 ----------------------------------------
-WEECHAT_HDATA_VAR(struct t_myplugin_list, name, STRING);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, buffer, POINTER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, count, INTEGER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, prev, POINTER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, next, POINTER);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, name, STRING, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, buffer, POINTER, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, count, INTEGER, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, prev, POINTER, "myplugin_list");
+WEECHAT_HDATA_VAR(struct t_myplugin_list, next, POINTER, "myplugin_list");
 ----------------------------------------
 
 [NOTE]
@@ -12153,8 +12156,7 @@ Exemple en C :
 
 [source,C]
 ----------------------------------------
-weechat_printf (NULL, "type = %s",
-                weechat_hdata_get_var_type_string (hdata, "name"));
+weechat_printf (NULL, "type = %s", weechat_hdata_get_var_type_string (hdata, "name"));
 ----------------------------------------
 
 Script (Python):
@@ -12165,7 +12167,48 @@ Script (Python):
 type = weechat.hdata_get_var_type_string(hdata, name)
 
 # exemple
-weechat.prnt("", "type = %s" % weechat.hdata_get_var_type_string("name"))
+weechat.prnt("", "type = %s" % weechat.hdata_get_var_type_string(hdata, "name"))
+----------------------------------------
+
+weechat_hdata_get_var_hdata
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Nouveau dans la version 0.3.6._
+
+Retourne le hdata pour la variable dans le hdata.
+
+Prototype :
+
+[source,C]
+----------------------------------------
+const char *weechat_hdata_get_var_hdata (struct t_hdata *hdata, const char *name);
+----------------------------------------
+
+Paramètres :
+
+* 'hdata' : pointeur vers le hdata
+* 'name' : nom de la variable
+
+Valeur de retour :
+
+* hdata pour la variable, NULL si pas de hdata ou en cas d'erreur
+
+Exemple en C :
+
+[source,C]
+----------------------------------------
+weechat_printf (NULL, "hdata = %s", weechat_hdata_get_var_hdata (hdata, "name"));
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototype
+hdata_name = weechat.hdata_get_var_hdata(hdata, name)
+
+# exemple
+weechat.prnt("", "hdata = %s" % weechat.hdata_get_var_hdata(hdata, "name"))
 ----------------------------------------
 
 weechat_hdata_get_var
diff --git a/doc/it/autogen/plugin_api/hdata.txt b/doc/it/autogen/plugin_api/hdata.txt
index e707c8d8a..44f2f6472 100644
--- a/doc/it/autogen/plugin_api/hdata.txt
+++ b/doc/it/autogen/plugin_api/hdata.txt
@@ -19,22 +19,22 @@
   'pv_remote_nick_color' (string) +
   'hook_autorejoin' (pointer) +
   'nicks_count' (integer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
+  'nicks' (pointer, hdata: 'irc_nick') +
+  'last_nick' (pointer, hdata: 'irc_nick') +
   'nicks_speaking' (pointer) +
-  'nicks_speaking_time' (pointer) +
-  'last_nick_speaking_time' (pointer) +
-  'buffer' (pointer) +
+  'nicks_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'last_nick_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'prev_channel' (pointer) +
-  'next_channel' (pointer) |
+  'prev_channel' (pointer, hdata: 'irc_channel') +
+  'next_channel' (pointer, hdata: 'irc_channel') |
   -
 
 | irc | irc_channel_speaking | irc channel_speaking |
   'nick' (string) +
   'time_last_message' (time) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
+  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
   -
 
 | irc | irc_ignore | irc ignore |
@@ -43,8 +43,8 @@
   'regex_mask' (pointer) +
   'server' (string) +
   'channel' (string) +
-  'prev_ignore' (pointer) +
-  'next_ignore' (pointer) |
+  'prev_ignore' (pointer, hdata: 'irc_ignore') +
+  'next_ignore' (pointer, hdata: 'irc_ignore') |
   'irc_ignore_list' +
   'last_irc_ignore'
 
@@ -55,23 +55,23 @@
   'prefix' (string) +
   'away' (integer) +
   'color' (string) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'irc_nick') +
+  'next_nick' (pointer, hdata: 'irc_nick') |
   -
 
 | irc | irc_notify | irc notify |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'nick' (string) +
   'check_away' (integer) +
   'is_on_server' (integer) +
   'away_message' (string) +
   'ison_received' (integer) +
-  'prev_notify' (pointer) +
-  'next_notify' (pointer) |
+  'prev_notify' (pointer, hdata: 'irc_notify') +
+  'next_notify' (pointer, hdata: 'irc_notify') |
   -
 
 | irc | irc_redirect | irc redirect |
-  'server' (pointer) +
+  'server' (pointer, hdata: 'irc_server') +
   'pattern' (string) +
   'signal' (string) +
   'count' (integer) +
@@ -88,8 +88,8 @@
   'cmd_filter' (pointer) +
   'output' (string) +
   'output_size' (integer) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect') +
+  'next_redirect' (pointer, hdata: 'irc_redirect') |
   -
 
 | irc | irc_redirect_pattern | pattern for irc redirect |
@@ -99,8 +99,8 @@
   'cmd_start' (string) +
   'cmd_stop' (string) +
   'cmd_extra' (string) +
-  'prev_redirect' (pointer) +
-  'next_redirect' (pointer) |
+  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
+  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
   'irc_redirect_patterns' +
   'last_irc_redirect_pattern'
 
@@ -118,10 +118,10 @@
   'current_ip' (string) +
   'current_port' (integer) +
   'sock' (integer) +
-  'hook_connect' (pointer) +
-  'hook_fd' (pointer) +
-  'hook_timer_connection' (pointer) +
-  'hook_timer_sasl' (pointer) +
+  'hook_connect' (pointer, hdata: 'hook') +
+  'hook_fd' (pointer, hdata: 'hook') +
+  'hook_timer_connection' (pointer, hdata: 'hook') +
+  'hook_timer_sasl' (pointer, hdata: 'hook') +
   'is_connected' (integer) +
   'ssl_connected' (integer) +
   'gnutls_sess' (other) +
@@ -153,17 +153,17 @@
   'last_away_check' (time) +
   'outqueue' (pointer) +
   'last_outqueue' (pointer) +
-  'redirects' (pointer) +
-  'last_redirect' (pointer) +
-  'notify_list' (pointer) +
-  'last_notify' (pointer) +
+  'redirects' (pointer, hdata: 'irc_redirect') +
+  'last_redirect' (pointer, hdata: 'irc_redirect') +
+  'notify_list' (pointer, hdata: 'irc_notify') +
+  'last_notify' (pointer, hdata: 'irc_notify') +
   'manual_joins' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'buffer_as_string' (string) +
-  'channels' (pointer) +
-  'last_channel' (pointer) +
-  'prev_server' (pointer) +
-  'next_server' (pointer) |
+  'channels' (pointer, hdata: 'irc_channel') +
+  'last_channel' (pointer, hdata: 'irc_channel') +
+  'prev_server' (pointer, hdata: 'irc_server') +
+  'next_server' (pointer, hdata: 'irc_server') |
   'irc_servers' +
   'last_irc_server'
 
@@ -177,23 +177,23 @@
   'items_array' (pointer) +
   'bar_window' (pointer) +
   'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer) +
-  'next_bar' (pointer) |
+  'prev_bar' (pointer, hdata: 'bar') +
+  'next_bar' (pointer, hdata: 'bar') |
   'gui_bars' +
   'last_gui_bar'
 
 | weechat | bar_item | bar item |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'build_callback' (pointer) +
   'build_callback_data' (pointer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'bar_item') +
+  'next_item' (pointer, hdata: 'bar_item') |
   'gui_bar_items' +
   'last_gui_bar_item'
 
 | weechat | buffer | buffer |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'plugin_name_for_upgrade' (string) +
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
@@ -209,14 +209,14 @@
   'close_callback' (pointer) +
   'close_callback_data' (pointer) +
   'title' (string) +
-  'own_lines' (pointer) +
-  'mixed_lines' (pointer) +
-  'lines' (pointer) +
+  'own_lines' (pointer, hdata: 'lines') +
+  'mixed_lines' (pointer, hdata: 'lines') +
+  'lines' (pointer, hdata: 'lines') +
   'time_for_each_line' (integer) +
   'chat_refresh_needed' (integer) +
   'nicklist' (integer) +
   'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer) +
+  'nicklist_root' (pointer, hdata: 'nick_group') +
   'nicklist_max_length' (integer) +
   'nicklist_display_groups' (integer) +
   'nicklist_visible_count' (integer) +
@@ -230,15 +230,15 @@
   'input_buffer_length' (integer) +
   'input_buffer_pos' (integer) +
   'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer) +
-  'input_undo' (pointer) +
-  'last_input_undo' (pointer) +
-  'ptr_input_undo' (pointer) +
+  'input_undo_snap' (pointer, hdata: 'input_undo') +
+  'input_undo' (pointer, hdata: 'input_undo') +
+  'last_input_undo' (pointer, hdata: 'input_undo') +
+  'ptr_input_undo' (pointer, hdata: 'input_undo') +
   'input_undo_count' (integer) +
-  'completion' (pointer) +
-  'history' (pointer) +
-  'last_history' (pointer) +
-  'ptr_history' (pointer) +
+  'completion' (pointer, hdata: 'completion') +
+  'history' (pointer, hdata: 'history') +
+  'last_history' (pointer, hdata: 'history') +
+  'ptr_history' (pointer, hdata: 'history') +
   'num_history' (integer) +
   'text_search' (integer) +
   'text_search_exact' (integer) +
@@ -251,17 +251,17 @@
   'highlight_tags_count' (integer) +
   'highlight_tags_array' (pointer) +
   'hotlist_max_level_nicks' (pointer) +
-  'keys' (pointer) +
-  'last_key' (pointer) +
+  'keys' (pointer, hdata: 'key') +
+  'last_key' (pointer, hdata: 'key') +
   'keys_count' (integer) +
   'local_variables' (pointer) +
-  'prev_buffer' (pointer) +
-  'next_buffer' (pointer) |
+  'prev_buffer' (pointer, hdata: 'buffer') +
+  'next_buffer' (pointer, hdata: 'buffer') |
   'gui_buffers' +
   'last_gui_buffer'
 
 | weechat | completion | structure with completion |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'context' (integer) +
   'base_command' (string) +
   'base_command_arg_index' (integer) +
@@ -278,34 +278,34 @@
   'position_replace' (integer) +
   'diff_size' (integer) +
   'diff_length' (integer) +
-  'partial_completion_list' (pointer) +
-  'last_partial_completion' (pointer) |
+  'partial_completion_list' (pointer, hdata: 'completion_partial') +
+  'last_partial_completion' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | completion_partial | structure with partial completion |
   'word' (string) +
   'count' (integer) +
-  'prev_item' (pointer) +
-  'next_item' (pointer) |
+  'prev_item' (pointer, hdata: 'completion_partial') +
+  'next_item' (pointer, hdata: 'completion_partial') |
   -
 
 | weechat | config_file | config file |
-  'plugin' (pointer) +
+  'plugin' (pointer, hdata: 'plugin') +
   'name' (string) +
   'filename' (string) +
   'file' (pointer) +
   'callback_reload' (pointer) +
   'callback_reload_data' (pointer) +
-  'sections' (pointer) +
-  'last_section' (pointer) +
-  'prev_config' (pointer) +
-  'next_config' (pointer) |
+  'sections' (pointer, hdata: 'config_section') +
+  'last_section' (pointer, hdata: 'config_section') +
+  'prev_config' (pointer, hdata: 'config_file') +
+  'next_config' (pointer, hdata: 'config_file') |
   'config_files' +
   'last_config_file'
 
 | weechat | config_option | config option |
-  'config_file' (pointer) +
-  'section' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
+  'section' (pointer, hdata: 'config_section') +
   'name' (string) +
   'type' (integer) +
   'description' (string) +
@@ -322,12 +322,12 @@
   'callback_delete' (pointer) +
   'callback_delete_data' (pointer) +
   'loaded' (integer) +
-  'prev_option' (pointer) +
-  'next_option' (pointer) |
+  'prev_option' (pointer, hdata: 'config_option') +
+  'next_option' (pointer, hdata: 'config_option') |
   -
 
 | weechat | config_section | config section |
-  'config_file' (pointer) +
+  'config_file' (pointer, hdata: 'config_file') +
   'name' (string) +
   'user_can_add_options' (integer) +
   'user_can_delete_options' (integer) +
@@ -341,10 +341,10 @@
   'callback_create_option_data' (pointer) +
   'callback_delete_option' (pointer) +
   'callback_delete_option_data' (pointer) +
-  'options' (pointer) +
-  'last_option' (pointer) +
-  'prev_section' (pointer) +
-  'next_section' (pointer) |
+  'options' (pointer, hdata: 'config_option') +
+  'last_option' (pointer, hdata: 'config_option') +
+  'prev_section' (pointer, hdata: 'config_section') +
+  'next_section' (pointer, hdata: 'config_section') |
   -
 
 | weechat | filter | filter |
@@ -359,206 +359,42 @@
   'regex' (string) +
   'regex_prefix' (pointer) +
   'regex_message' (pointer) +
-  'prev_filter' (pointer) +
-  'next_filter' (pointer) |
+  'prev_filter' (pointer, hdata: 'filter') +
+  'next_filter' (pointer, hdata: 'filter') |
   'gui_filters' +
   'last_gui_filter'
 
 | weechat | history | history of commands in buffer |
   'text' (string) +
-  'next_history' (pointer) +
-  'prev_history' (pointer) |
+  'next_history' (pointer, hdata: 'history') +
+  'prev_history' (pointer, hdata: 'history') |
   -
 
-| weechat | hook | hook (variables common to all hook types) |
-  'plugin' (pointer) +
-  'type' (integer) +
-  'deleted' (integer) +
-  'running' (integer) +
-  'priority' (integer) +
-  'callback_data' (pointer) +
-  'hook_data' (pointer) +
-  'prev_hook' (pointer) +
-  'next_hook' (pointer) |
-  -
-
-| weechat | hook_command | hook of type "command" |
-  'callback' (pointer) +
-  'command' (string) +
-  'description' (string) +
-  'args' (string) +
-  'args_description' (string) +
-  'completion' (string) +
-  'cplt_num_templates' (integer) +
-  'cplt_templates' (pointer) +
-  'cplt_templates_static' (pointer) +
-  'cplt_template_num_args' (pointer) +
-  'cplt_template_args' (pointer) +
-  'cplt_template_num_args_concat' (integer) +
-  'cplt_template_args_concat' (pointer) |
-  'last_weechat_hook_command' +
-  'weechat_hooks_command'
-
-| weechat | hook_command_run | hook of type "command_run" |
-  'callback' (pointer) +
-  'command' (string) |
-  'last_weechat_hook_command_run' +
-  'weechat_hooks_command_run'
-
-| weechat | hook_completion | hook of type "completion" |
-  'callback' (pointer) +
-  'completion_item' (string) +
-  'description' (string) |
-  'last_weechat_hook_completion' +
-  'weechat_hooks_completion'
-
-| weechat | hook_config | hook of type "config" |
-  'callback' (pointer) +
-  'option' (string) |
-  'last_weechat_hook_config' +
-  'weechat_hooks_config'
-
-| weechat | hook_connect | hook of type "connect" |
-  'callback' (pointer) +
-  'proxy' (string) +
-  'address' (string) +
-  'port' (integer) +
-  'sock' (integer) +
-  'ipv6' (integer) +
-  'gnutls_sess' (pointer) +
-  'gnutls_cb' (pointer) +
-  'gnutls_dhkey_size' (integer) +
-  'gnutls_priorities' (string) +
-  'local_hostname' (string) +
-  'child_read' (integer) +
-  'child_write' (integer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'handshake_hook_fd' (pointer) +
-  'handshake_hook_timer' (pointer) +
-  'handshake_fd_flags' (integer) +
-  'handshake_ip_address' (string) |
-  'last_weechat_hook_connect' +
-  'weechat_hooks_connect'
-
-| weechat | hook_fd | hook of type "fd" |
-  'callback' (pointer) +
-  'fd' (integer) +
-  'flags' (integer) +
-  'error' (integer) |
-  'last_weechat_hook_fd' +
-  'weechat_hooks_fd'
-
-| weechat | hook_hdata | hook of type "hdata" |
-  'callback' (pointer) +
-  'hdata_name' (string) +
-  'description' (string) |
-  'last_weechat_hook_hdata' +
-  'weechat_hooks_hdata'
-
-| weechat | hook_hsignal | hook of type "hsignal" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_hsignal' +
-  'weechat_hooks_hsignal'
-
-| weechat | hook_info | hook of type "info" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_info' +
-  'weechat_hooks_info'
-
-| weechat | hook_info_hashtable | hook of type "info_hashtable" |
-  'callback' (pointer) +
-  'info_name' (string) +
-  'description' (string) +
-  'args_description' (string) +
-  'output_description' (string) |
-  'last_weechat_hook_info_hashtable' +
-  'weechat_hooks_info_hashtable'
-
-| weechat | hook_infolist | hook of type "infolist" |
-  'callback' (pointer) +
-  'infolist_name' (string) +
-  'description' (string) +
-  'pointer_description' (string) +
-  'args_description' (string) |
-  'last_weechat_hook_infolist' +
-  'weechat_hooks_infolist'
-
-| weechat | hook_modifier | hook of type "modifier" |
-  'callback' (pointer) +
-  'modifier' (string) |
-  'last_weechat_hook_modifier' +
-  'weechat_hooks_modifier'
-
-| weechat | hook_print | hook of type "print" |
-  'callback' (pointer) +
-  'buffer' (pointer) +
-  'tags_count' (integer) +
-  'tags_array' (pointer) +
-  'message' (string) +
-  'strip_colors' (integer) |
-  'last_weechat_hook_print' +
-  'weechat_hooks_print'
-
-| weechat | hook_process | hook of type "process" |
-  'callback' (pointer) +
-  'command' (string) +
-  'timeout' (long) +
-  'child_read' (pointer) +
-  'child_write' (pointer) +
-  'child_pid' (other) +
-  'hook_fd' (pointer) +
-  'hook_timer' (pointer) +
-  'buffer' (pointer) +
-  'buffer_size' (pointer) |
-  'last_weechat_hook_process' +
-  'weechat_hooks_process'
-
-| weechat | hook_signal | hook of type "signal" |
-  'callback' (pointer) +
-  'signal' (string) |
-  'last_weechat_hook_signal' +
-  'weechat_hooks_signal'
-
-| weechat | hook_timer | hook of type "timer" |
-  'callback' (pointer) +
-  'interval' (long) +
-  'align_second' (integer) +
-  'remaining_calls' (integer) +
-  'last_exec' (other) +
-  'next_exec' (other) |
-  'last_weechat_hook_timer' +
-  'weechat_hooks_timer'
-
 | weechat | input_undo | structure with undo for input line |
   'data' (string) +
   'pos' (integer) +
-  'prev_undo' (pointer) +
-  'next_undo' (pointer) |
+  'prev_undo' (pointer, hdata: 'input_undo') +
+  'next_undo' (pointer, hdata: 'input_undo') |
   -
 
 | weechat | key | a key (keyboard shortcut) |
   'key' (string) +
   'command' (string) +
-  'prev_key' (pointer) +
-  'next_key' (pointer) |
+  'prev_key' (pointer, hdata: 'key') +
+  'next_key' (pointer, hdata: 'key') |
   'gui_default_keys' +
   'gui_keys' +
   'last_gui_default_key' +
   'last_gui_key'
 
 | weechat | line | structure with one line |
-  'data' (pointer) +
-  'prev_line' (pointer) +
-  'next_line' (pointer) |
+  'data' (pointer, hdata: 'line_data') +
+  'prev_line' (pointer, hdata: 'line') +
+  'next_line' (pointer, hdata: 'line') |
   -
 
 | weechat | line_data | structure with one line data |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'y' (integer) +
   'date' (time) +
   'date_printed' (time) +
@@ -574,9 +410,9 @@
   -
 
 | weechat | lines | structure with lines |
-  'first_line' (pointer) +
-  'last_line' (pointer) +
-  'last_read_line' (pointer) +
+  'first_line' (pointer, hdata: 'line') +
+  'last_line' (pointer, hdata: 'line') +
+  'last_read_line' (pointer, hdata: 'line') +
   'lines_count' (integer) +
   'first_line_not_read' (integer) +
   'lines_hidden' (integer) +
@@ -585,14 +421,14 @@
   -
 
 | weechat | nick | nick in nicklist |
-  'group' (pointer) +
+  'group' (pointer, hdata: 'nick_group') +
   'name' (string) +
   'color' (string) +
   'prefix' (string) +
   'prefix_color' (string) +
   'visible' (integer) +
-  'prev_nick' (pointer) +
-  'next_nick' (pointer) |
+  'prev_nick' (pointer, hdata: 'nick') +
+  'next_nick' (pointer, hdata: 'nick') |
   -
 
 | weechat | nick_group | group in nicklist |
@@ -600,15 +436,30 @@
   'color' (string) +
   'visible' (integer) +
   'level' (integer) +
-  'parent' (pointer) +
-  'childs' (pointer) +
-  'last_child' (pointer) +
-  'nicks' (pointer) +
-  'last_nick' (pointer) +
-  'prev_group' (pointer) +
-  'next_group' (pointer) |
+  'parent' (pointer, hdata: 'nick_group') +
+  'childs' (pointer, hdata: 'nick_group') +
+  'last_child' (pointer, hdata: 'nick_group') +
+  'nicks' (pointer, hdata: 'nick') +
+  'last_nick' (pointer, hdata: 'nick') +
+  'prev_group' (pointer, hdata: 'nick_group') +
+  'next_group' (pointer, hdata: 'nick_group') |
   -
 
+| weechat | plugin | plugin |
+  'filename' (string) +
+  'handle' (pointer) +
+  'name' (string) +
+  'description' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'charset' (string) +
+  'debug' (integer) +
+  'prev_plugin' (pointer, hdata: 'plugin') +
+  'next_plugin' (pointer, hdata: 'plugin') |
+  'last_weechat_plugin' +
+  'weechat_plugins'
+
 | weechat | window | window |
   'win_x' (integer) +
   'win_y' (integer) +
@@ -626,37 +477,37 @@
   'last_bar_window' (pointer) +
   'refresh_needed' (integer) +
   'gui_objects' (pointer) +
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'layout_plugin_name' (string) +
   'layout_buffer_name' (string) +
-  'scroll' (pointer) +
-  'ptr_tree' (pointer) +
-  'prev_window' (pointer) +
-  'next_window' (pointer) |
+  'scroll' (pointer, hdata: 'window_scroll') +
+  'ptr_tree' (pointer, hdata: 'window_tree') +
+  'prev_window' (pointer, hdata: 'window') +
+  'next_window' (pointer, hdata: 'window') |
   'gui_current_window' +
   'gui_windows' +
   'last_gui_window'
 
 | weechat | window_scroll | scroll info in window |
-  'buffer' (pointer) +
+  'buffer' (pointer, hdata: 'buffer') +
   'first_line_displayed' (integer) +
-  'start_line' (pointer) +
+  'start_line' (pointer, hdata: 'line') +
   'start_line_pos' (integer) +
   'scrolling' (integer) +
   'start_col' (integer) +
   'lines_after' (integer) +
   'reset_allowed' (integer) +
-  'prev_scroll' (pointer) +
-  'next_scroll' (pointer) |
+  'prev_scroll' (pointer, hdata: 'window_scroll') +
+  'next_scroll' (pointer, hdata: 'window_scroll') |
   -
 
 | weechat | window_tree | tree of windows |
-  'parent_node' (pointer) +
+  'parent_node' (pointer, hdata: 'window_tree') +
   'split_pct' (integer) +
   'split_horizontal' (integer) +
-  'child1' (pointer) +
-  'child2' (pointer) +
-  'window' (pointer) |
+  'child1' (pointer, hdata: 'window_tree') +
+  'child2' (pointer, hdata: 'window_tree') +
+  'window' (pointer, hdata: 'window') |
   'gui_windows_tree'
 
 |========================================
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 00e976e08..23790ff6d 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -145,7 +145,8 @@ comando: comando da eseguire (una '/' viene aggiunta automaticamente se non trov
 /debug  list
         set <plugin> <level>
         dump [<plugin>]
-        buffer|color|hdata|infolists|memory|tags|term|windows
+        buffer|color|infolists|memory|tags|term|windows
+        hdata [free]
 
      list: list plugins with debug levels
       set: set debug level for plugin
@@ -154,7 +155,7 @@ comando: comando da eseguire (una '/' viene aggiunta automaticamente se non trov
      dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
    buffer: dump buffer content with hexadecimal values in log file
     color: display infos about current color pairs
-    hdata: display infos about hdata
+    hdata: display infos about hdata (with free: remove all hdata in memory)
 infolists: display infos about infolists
    memory: display infos about memory usage
      tags: display tags for lines
diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt
index 71df49f8c..a6fd80279 100644
--- a/doc/it/weechat_plugin_api.it.txt
+++ b/doc/it/weechat_plugin_api.it.txt
@@ -11795,7 +11795,8 @@ Prototipo:
 
 [source,C]
 ----------------------------------------
-void weechat_hdata_new_var (struct t_hdata *hdata, const char *name, int offset, int type);
+void weechat_hdata_new_var (struct t_hdata *hdata, const char *name, int offset, int type,
+                            const char *hdata_name);
 ----------------------------------------
 
 Argomenti:
@@ -11810,6 +11811,7 @@ Argomenti:
 ** WEECHAT_HDATA_POINTER
 ** WEECHAT_HDATA_TIME
 ** WEECHAT_HDATA_OTHER
+* 'hdata_name': name of a hdata (if it's a pointer to a structure with hdata)
 
 Esempio in C:
 
@@ -11827,22 +11829,22 @@ struct t_myplugin_list
 /* ... */
 
 struct t_hdata *hdata = weechat_hdata_new ("myplugin_list", "prev", "next");
-weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING);
-weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER);
-weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER);
+weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING, NULL);
+weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER, NULL);
+weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER, NULL);
+weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER, "myplugin_list");
+weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER, "myplugin_list");
 ----------------------------------------
 
 The macro "WEECHAT_HDATA_VAR" can be used to shorten code:
 
 [source,C]
 ----------------------------------------
-WEECHAT_HDATA_VAR(struct t_myplugin_list, name, STRING);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, buffer, POINTER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, count, INTEGER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, prev, POINTER);
-WEECHAT_HDATA_VAR(struct t_myplugin_list, next, POINTER);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, name, STRING, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, buffer, POINTER, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, count, INTEGER, NULL);
+WEECHAT_HDATA_VAR(struct t_myplugin_list, prev, POINTER, "myplugin_list");
+WEECHAT_HDATA_VAR(struct t_myplugin_list, next, POINTER, "myplugin_list");
 ----------------------------------------
 
 [NOTE]
@@ -11888,11 +11890,11 @@ struct t_myplugin_list *last_buffer = NULL;
 /* ... */
 
 struct t_hdata *hdata = weechat_hdata_new ("myplugin_list", "prev", "next");
-weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING);
-weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER);
-weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER);
-weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER);
+weechat_hdata_new_var (hdata, "name", offsetof (struct t_myplugin_list, name), WEECHAT_HDATA_STRING, NULL);
+weechat_hdata_new_var (hdata, "buffer", offsetof (struct t_myplugin_list, buffer), WEECHAT_HDATA_POINTER, NULL);
+weechat_hdata_new_var (hdata, "count", offsetof (struct t_myplugin_list, count), WEECHAT_HDATA_INTEGER, NULL);
+weechat_hdata_new_var (hdata, "prev", offsetof (struct t_myplugin_list, prev), WEECHAT_HDATA_POINTER, "myplugin_list");
+weechat_hdata_new_var (hdata, "next", offsetof (struct t_myplugin_list, next), WEECHAT_HDATA_POINTER, "myplugin_list");
 weechat_hdata_new_list (hdata, "buffers", &buffers);
 weechat_hdata_new_list (hdata, "last_buffer", &last_buffer);
 ----------------------------------------
@@ -12087,7 +12089,49 @@ Script (Python):
 type = weechat.hdata_get_var_type_string(hdata, name)
 
 # esempio
-weechat.prnt("", "type = %s" % weechat.hdata_get_var_type_string("name"))
+weechat.prnt("", "type = %s" % weechat.hdata_get_var_type_string(hdata, "name"))
+----------------------------------------
+
+// TRANSLATION MISSING
+weechat_hdata_get_var_hdata
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+_Novità nella versione 0.3.6._
+
+Return hdata for variable in hdata.
+
+Prototipo:
+
+[source,C]
+----------------------------------------
+const char *weechat_hdata_get_var_hdata (struct t_hdata *hdata, const char *name);
+----------------------------------------
+
+Argomenti:
+
+* 'hdata': hdata pointer
+* 'name': variable name
+
+Valore restituito:
+
+* hdata for variable, NULL if no hdata or if an error occured
+
+Esempio in C:
+
+[source,C]
+----------------------------------------
+weechat_printf (NULL, "hdata = %s", weechat_hdata_get_var_hdata (hdata, "name"));
+----------------------------------------
+
+Script (Python):
+
+[source,python]
+----------------------------------------
+# prototipo
+hdata_name = weechat.hdata_get_var_hdata(hdata, name)
+
+# esempio
+weechat.prnt("", "hdata = %s" % weechat.hdata_get_var_hdata(hdata, "name"))
 ----------------------------------------
 
 // TRANSLATION MISSING