Version 1.5

core: add detection of Tcl 8.6 in autotools
debian: update changelog and copyright
2026-06-21 18:36:39 +02:00 · 2016-05-01 12:50:12 +02:00 · 2016-05-01 11:36:18 +02:00 · 2016-05-01 09:26:37 +02:00 · 2016-05-01 09:16:18 +02:00 · 2016-05-01 08:58:19 +02:00
62 changed files with 13384 additions and 230 deletions
@@ -11,7 +11,7 @@ Sébastien Helleu <flashcode@flashtux.org> <flashcode>
 Sébastien Helleu <flashcode@flashtux.org> <uid67137>
 Nils Görs <weechatter@arcor.de>
 Ryuunosuke Ayanokouzi <i38w7i3@yahoo.co.jp>
-Krzysztof Korościk <soltys@szluug.org>
+Krzysztof Korościk <soltys1@gmail.com>
 Marco Paolone <marcopaolone@gmail.com>
 <marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
 <mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>
@@ -94,6 +94,7 @@ Alphabetically:
 * Tom Alsberg
 * Tor Hveem (xt)
 * Valentin Lorentz (progval)
+* Vasco Almeida
 * Voroskoi
 * Yannick Palanque

@@ -16,21 +16,21 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]


 [[1.5]]
-== Version 1.5 (under dev)
+== Version 1.5 (2016-05-01)

 [[1.5_features]]
 === New features

+* core: add Portuguese translations
 * core: change default value of option weechat.look.nick_color_hash to "djb2"
-* core: fix nick coloring when stop chars and a forced color are used: first
-  remove chars then look for forced color
 * core: move nick coloring from irc plugin to core, move options
  irc.look.nick_color_force, irc.look.nick_color_hash and
  irc.look.nick_color_stop_chars to core, add info "nick_color" and
  "nick_color_name", deprecate info "irc_nick_color" and "irc_color_name"
  (issue #262)
 * core: move irc bar item "away" to core, move options
-  "irc.look.item_away_message" and "irc.color.item_away" to core (issue #692)
+  irc.look.item_away_message and irc.color.item_away to core (issue #692)
+* api: add support of functions in hook_process
 * api: add pointer in callbacks used in scripting API (issue #406)
 * irc: add option irc.network.sasl_fail_unavailable (issue #600, issue #697)
 * irc: add multiple targets and support of "-server" in command /ctcp
@@ -42,15 +42,21 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 [[1.5_bugs]]
 === Bugs fixed

+* core: fix nick coloring when stop chars and a forced color are used: first
+  remove chars then look for forced color
 * core: check that pointers received in arguments are not NULL in buffers and
  windows functions
 * core: fix truncation of buffer names in hotlist (issue #668)
-* core: fix update of window title under tmux (issue #685)
+* core: fix update of window title under Tmux (issue #685)
 * core: fix detection of Python shared libraries (issue #676)
 * api: fix number of arguments returned by function string_split() when
  keep_eol is 2 and the string ends with separators
+* irc: fix first message displayed in raw buffer when the message is modified
+  by a modifier (issue #719)
 * irc: add missing completion "*" for target in command /msg
 * irc: fix /msg command with multiple targets including "*"
+* lua: fix crash when a lua function doesn't return a value and a string was
+  expected (issue #718)
 * relay: do not execute any command received in a PRIVMSG message from an irc
  relay client (issue #699)
 * relay: fix the max number of clients connected on a port, allow value 0 for
@@ -112,7 +118,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * core: fix memory leak when using multiple "-d" or "-r" in command line
  arguments
 * core: don't complain any more about "tmux" and "tmux-256color" $TERM values
-  when WeeChat is running under tmux (issue #519)
+  when WeeChat is running under Tmux (issue #519)
 * core: fix truncated messages after a word with a length of zero on screen
  (for example a zero width space: U+200B) (bug #40985, issue #502)
 * api: fix handle of invalid escape in function string_convert_escaped_chars()
@@ -454,7 +460,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]

 * core: add terabyte unit for size displayed
 * core: display a warning on startup if $TERM does not start with "screen"
-  under screen/tmux
+  under Screen/Tmux
 * core: add option weechat.color.status_nicklist_count (issue #109,
  issue #110)
 * core: add option "env" in command /set (manage environment variables)
@@ -1437,7 +1443,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * core: add default keys key[ctrl-]key[Left]/key[Right] (`meta2-1;5D` /
  `meta2-1;5C`) for gnome-terminal
 * core: add option "hooks" in command /debug
-* core: add option "weechat.look.scroll_bottom_after_switch" (if enabled,
+* core: add option weechat.look.scroll_bottom_after_switch (if enabled,
  restore old behavior before fix of bug #25555 in version 0.3.5)
 * core: add new option weechat.completion.base_word_until_cursor: allow
  completion in middle of words (enabled by default) (task #9771)
@@ -1796,7 +1802,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * core: add info "weechat_upgrading", signal "upgrade_ended", display duration
  of upgrade
 * core: replace the 10 nick color options and number of nick colors by a single
-  option "weechat.color.chat_nick_colors" (comma separated list of colors)
+  option weechat.color.chat_nick_colors (comma separated list of colors)
 * core: add color support in option weechat.look.buffer_time_format
 * core: add new option weechat.look.highlight_regex and function
  string_has_highlight_regex() in plugin API (task #10321)
@@ -2187,7 +2193,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * relay: add relay plugin (network communication between WeeChat and remote
  application)
 * xfer: add speed limit for DCC files sending (task #6178)
-* xfer: add new option "xfer.file.use_nick_in_filename" for Xfer files
+* xfer: add new option xfer.file.use_nick_in_filename for Xfer files
  (task #7140)
 * plugins: add some other plugins: alias, demo, fifo, tcl, xfer
 * scripts: new scripts: weeget.py (scripts manager), jabber.py (jabber/XMPP
@@ -2615,7 +2621,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * fix refresh bug (too many refresh) when terminal is resized
 * fix nicklist display bugs when on top or bottom of chat window
 * fix --disable-plugins option in configure script
-* fix high CPU usage when running under a screen that has been killed
+* fix high CPU usage when running under a Screen that has been killed

 [[0.1.8]]
 == Version 0.1.8 (2006-03-18)
@@ -18,7 +18,7 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]


 [[1.5]]
-== Version 1.5 (under dev)
+== Version 1.5 (2016-05-01)

 [[1.5_nick_coloring]]
 === Nick coloring moved to core
@@ -58,7 +58,7 @@ solaris*)
 esac

 # Gettext
-ALL_LINGUAS="cs de es fr hu it ja pl pt_BR ru tr"
+ALL_LINGUAS="cs de es fr hu it ja pl pt pt_BR ru tr"
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([0.18])

@@ -765,7 +765,7 @@ if test "x$enable_tcl" = "xyes" ; then

    AC_MSG_CHECKING(for tclConfig.sh)
    tcl_found="no"
-    tcl_dirs="/usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
+    tcl_dirs="/usr/lib/tcl8.6 /usr/lib64/tcl8.6 /usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.6/lib /usr/local/tcl-8.6/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
    if test "x$tclconfig" != "x" ; then
      tcl_dirs="${tclconfig} ${tcl_dirs}"
    fi
@@ -17,7 +17,7 @@ Build-Depends:
    python-dev,
    libaspell-dev,
    liblua5.1-0-dev,
-    tcl8.5-dev,
+    tcl8.6-dev,
    guile-2.0-dev,
    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
    libcurl4-gnutls-dev,
@@ -26,8 +26,8 @@ Build-Depends:
    zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: https://weechat.org/
-Vcs-Git: https://github.com/weechat/weechat.git
-Vcs-Browser: https://github.com/weechat/weechat
+Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git

 Package: weechat-devel
 Architecture: all
@@ -1,3 +1,22 @@
+weechat (1.4-2) unstable; urgency=medium
+
+  * Fix Vcs-(Git|Browser) fields to use secure URIs
+  * Enable hardening=+all build
+  * Add a patch to build ruby plugin against ruby2.3 (fix FTBFS). Thanks
+    to Christian Hofstaedtler for the patch (Closes: #816312)
+  * Build Tcl plugin against Tcl 8.6 (Closes: #812320)
+  * Bump Standards-Version to 3.9.7
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 04 Mar 2016 15:58:54 +0100
+
+weechat (1.4-1) unstable; urgency=medium
+
+  * New upstream release
+    - Update copyright (new year)
+    - Refresh XPM menu icon following upstream changes
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 15 Jan 2016 15:16:11 +0100
+
 weechat (1.3-1) unstable; urgency=medium

  * New upstream release
@@ -17,7 +17,7 @@ Build-Depends:
    python-dev,
    libaspell-dev,
    liblua5.1-0-dev,
-    tcl8.5-dev,
+    tcl8.6-dev,
    guile-2.0-dev,
    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
    libcurl4-gnutls-dev,
@@ -26,8 +26,8 @@ Build-Depends:
    zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: https://weechat.org/
-Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git
+Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git

 Package: weechat
 Architecture: all
@@ -11,7 +11,7 @@ License: GPL-3+

 Files: debian/*
 Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
-           2008-2014, Emmanuel Bouthenot <kolter@openics.org>
+           2008-2016, Emmanuel Bouthenot <kolter@openics.org>
 License: GPL-3+

 License: GPL-3+
@@ -42,14 +42,12 @@

 | address_scope | long |

-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

 | noproxy | string |

-| socks5_gssapi_service | string |
-
 | socks5_gssapi_nec | long |

 | tcp_keepalive | long |
@@ -58,15 +56,27 @@

 | tcp_keepintvl | long |

+| unix_socket_path | string |
+
+| path_as_is | long |
+
+| proxy_service_name | string |
+
+| service_name | string |
+
+| default_protocol | string |
+
+| socks5_gssapi_service | string |
+
 | netrc | long | ignored, optional, required

 | userpwd | string |

 | proxyuserpwd | string |

-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

 | netrc_file | string |

@@ -116,7 +126,7 @@

 | cookiejar | string |

-| http_version | long | none, 1_0, 1_1
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls

 | cookiesession | long |

@@ -144,6 +154,10 @@

 | headeropt | mask | unified, separate

+| pipewait | long |
+
+| stream_weight | long |
+
 | mail_from | string |

 | mail_auth | string |
@@ -302,12 +316,18 @@

 | gssapi_delegation | long | none, policy_flag, flag

-| ssl_options | long | allow_beast
+| ssl_options | long | allow_beast, no_revoke

 | ssl_enable_alpn | long |

 | ssl_enable_npn | long |

+| pinnedpublickey | string |
+
+| ssl_verifystatus | long |
+
+| ssl_falsestart | long |
+
 | ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |
@@ -83,7 +83,8 @@ $ git clone https://github.com/weechat/weechat.git
 $ cd weechat
 ----

-NOTE: Um auf den aktuellen Stand zu kommen verwendest Du z.B. "`git pull`" in
+[NOTE]
+Um auf den aktuellen Stand zu kommen verwendest Du z.B. "`git pull`" in
 diesem Ordner.

 Ansonsten kannst Du das 'Entwickler-Paket' herunterladen und entpacken:
@@ -2282,7 +2282,9 @@ WeeChat unterstützt eine SASL Authentifikation, mittels verschiedener Mechanism
 * 'ecdsa-nist256p-challenge': Abgleich von öffentlichem/privatem Schlüssel
 * 'external': SSL Zertifikat welches auf Client Seite vorliegt
 * 'dh-blowfish': Passwort wird mittels blowfish verschlüsselt
+  (*unsicher*, wird nicht empfohlen)
 * 'dh-aes': Passwort wird mittels AES verschlüsselt
+  (*unsicher*, wird nicht empfohlen)

 [NOTE]
 Die "gcrypt" Bibliothek wird beim kompilieren von WeeChat benötigt um
@@ -42,14 +42,12 @@

 | address_scope | long |

-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

 | noproxy | string |

-| socks5_gssapi_service | string |
-
 | socks5_gssapi_nec | long |

 | tcp_keepalive | long |
@@ -58,15 +56,27 @@

 | tcp_keepintvl | long |

+| unix_socket_path | string |
+
+| path_as_is | long |
+
+| proxy_service_name | string |
+
+| service_name | string |
+
+| default_protocol | string |
+
+| socks5_gssapi_service | string |
+
 | netrc | long | ignored, optional, required

 | userpwd | string |

 | proxyuserpwd | string |

-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

 | netrc_file | string |

@@ -116,7 +126,7 @@

 | cookiejar | string |

-| http_version | long | none, 1_0, 1_1
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls

 | cookiesession | long |

@@ -144,6 +154,10 @@

 | headeropt | mask | unified, separate

+| pipewait | long |
+
+| stream_weight | long |
+
 | mail_from | string |

 | mail_auth | string |
@@ -302,12 +316,18 @@

 | gssapi_delegation | long | none, policy_flag, flag

-| ssl_options | long | allow_beast
+| ssl_options | long | allow_beast, no_revoke

 | ssl_enable_alpn | long |

 | ssl_enable_npn | long |

+| pinnedpublickey | string |
+
+| ssl_verifystatus | long |
+
+| ssl_falsestart | long |
+
 | ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |
@@ -2218,7 +2218,7 @@ Arguments:
 * 'string': string
 * 'length': max number of UTF-8 chars to check; if ≤ 0, the whole string is
  checked _(WeeChat ≥ 1.4)_
-* 'error': if not NULL, '*error*' is set with pointer to first non valid UTF-8
+* 'error': if not NULL, '*error' is set with pointer to first non valid UTF-8
  char in string, if any

 Return value:
@@ -7517,8 +7517,8 @@ struct t_hook *weechat_hook_process (const char *command,

 Arguments:

-* 'command': command to launch in child process or URL _(WeeChat ≥ 0.3.7)_
-  (see below)
+* 'command': command to launch in child process, URL _(WeeChat ≥ 0.3.7)_ or
+  function _(WeeChat ≥ 1.5)_ (see below)
 * 'timeout': timeout for command (in milliseconds): after this timeout, child
  process is killed (0 means no timeout)
 * 'callback': function called when data from child is available, or when child
@@ -7533,13 +7533,16 @@ Arguments:
 **** '2': transfer error
 **** '3': not enough memory
 **** '4': error with a file
-*** '< 0': 'WEECHAT_HOOK_PROCESS_RUNNING' (data available, but child still
-    running) or 'WEECHAT_HOOK_PROCESS_ERROR' (error when launching command)
+*** '< 0':
+**** 'WEECHAT_HOOK_PROCESS_RUNNING': data available, but child still running)
+**** 'WEECHAT_HOOK_PROCESS_ERROR': error when launching command
+**** 'WEECHAT_HOOK_PROCESS_CHILD': callback is called in the child process
 ** 'out': standard output of command (stdout)
 ** 'err': error output of command (stderr)
 ** return value:
 *** 'WEECHAT_RC_OK'
 *** 'WEECHAT_RC_ERROR'
+*** child process return code (in case of function with "func:" in command)
 * 'callback_pointer': pointer given to callback when it is called by WeeChat
 * 'callback_data': pointer given to callback when it is called by WeeChat;
  if not NULL, it must have been allocated with malloc (or similar function)
@@ -7552,9 +7555,18 @@ Return value:
 When command has ended, or if timeout is reached, WeeChat will automatically
 unhook (and kill process if it is still running).

-The command can be an URL with format: "url:http://www.example.com", to download
-content of URL _(WeeChat ≥ 0.3.7)_. Options are possible for URL with
-function <<_hook_process_hashtable,weechat_hook_process_hashtable>>.
+The command can be an URL with format: "url:http://www.example.com",
+to download content of URL _(WeeChat ≥ 0.3.7)_. Options are possible for URL
+with function <<_hook_process_hashtable,weechat_hook_process_hashtable>>.
+
+The command can also be a function name with format: "func:name", to execute
+the function "name" _(WeeChat ≥ 1.5)_. This function receives a single argument
+('data') and must return a string, which is sent to the callback. +
+In C API, the callback is called with the return code set to
+'WEECHAT_HOOK_PROCESS_CHILD', which means the callback is running in the child
+process (after fork). +
+In scripting API, the function 'name' is called directly and its result
+(string) is sent to the callback (like the output of an external command).

 [TIP]
 If you want to retrieve infos about WeeChat (like current stable version,
@@ -7575,6 +7587,7 @@ C example:

 [source,C]
 ----
+/* example with an external command */
 int
 my_process_cb (const void *pointer, void *data, const char *command,
               int return_code, const char *out, const char *err)
@@ -7605,6 +7618,52 @@ my_process_cb (const void *pointer, void *data, const char *command,

 struct t_hook *my_process_hook = weechat_hook_process ("ls", 5000,
                                                       &my_process_cb, NULL, NULL);
+
+/* example with the callback called in the child process */
+int
+my_process_cb (const void *pointer, void *data, const char *command,
+               int return_code, const char *out, const char *err)
+{
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        /* do something blocking... */
+        /* ... */
+
+        /* the stdout will be sent as "out" in the parent callback */
+        printf ("this is the result");
+
+        /* return code of the process */
+        return 0;
+    }
+    else
+    {
+        if (return_code == WEECHAT_HOOK_PROCESS_ERROR)
+        {
+            weechat_printf (NULL, "Error with command '%s'", command);
+            return WEECHAT_RC_OK;
+        }
+
+        if (return_code >= 0)
+        {
+            weechat_printf (NULL, "return_code = %d", return_code);
+        }
+
+        if (out)
+        {
+            weechat_printf (NULL, "stdout: %s", out);
+        }
+
+        if (err)
+        {
+            weechat_printf (NULL, "stderr: %s", err);
+        }
+
+        return WEECHAT_RC_OK;
+    }
+}
+
+struct t_hook *my_process_hook = weechat_hook_process ("func:get_status", 5000,
+                                                       &my_process_cb, NULL, NULL);
 ----

 Script (Python):
@@ -7614,7 +7673,7 @@ Script (Python):
 # prototype
 hook = weechat.hook_process(command, timeout, callback, callback_data)

-# example
+# example with an external command
 def my_process_cb(data, command, return_code, out, err):
    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
        weechat.prnt("", "Error with command '%s'" % command)
@@ -7628,6 +7687,26 @@ def my_process_cb(data, command, return_code, out, err):
    return weechat.WEECHAT_RC_OK

 hook = weechat.hook_process("ls", 5000, "my_process_cb", "")
+
+# example with a script function
+def get_status(data):
+    # do something blocking...
+    # ...
+    return "this is the result"
+
+def my_process_cb(data, command, return_code, out, err):
+    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
+        weechat.prnt("", "Error with command '%s'" % command)
+        return weechat.WEECHAT_RC_OK
+    if return_code >= 0:
+        weechat.prnt("", "return_code = %d" % return_code)
+    if out != "":
+        weechat.prnt("", "stdout: %s" % out)
+    if err != "":
+        weechat.prnt("", "stderr: %s" % err)
+    return weechat.WEECHAT_RC_OK
+
+hook = weechat.hook_process("func:get_status", 5000, "my_process_cb", "")
 ----

 ==== hook_process_hashtable
@@ -71,7 +71,8 @@ $ git clone https://github.com/weechat/weechat.git
 $ cd weechat
 ----

-NOTE: Later, you can run "`git pull`" in this directory, to get deltas with
+[NOTE]
+Later, you can run "`git pull`" in this directory, to get deltas with
 the latest updates.

 Otherwise you can download and unpack 'devel' package:
@@ -2229,8 +2229,8 @@ WeeChat supports SASL authentication, using different mechanisms:
 * 'plain': plain text password (default)
 * 'ecdsa-nist256p-challenge': challenge with public/private key
 * 'external': client side SSL cert
-* 'dh-blowfish': blowfish encrypted password
-* 'dh-aes': AES encrypted password
+* 'dh-blowfish': blowfish encrypted password (*insecure*, not recommended)
+* 'dh-aes': AES encrypted password (*insecure*, not recommended)

 [NOTE]
 The "gcrypt" library is required when compiling WeeChat in order to use
@@ -42,14 +42,12 @@

 | address_scope | long |

-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

 | noproxy | string |

-| socks5_gssapi_service | string |
-
 | socks5_gssapi_nec | long |

 | tcp_keepalive | long |
@@ -58,15 +56,27 @@

 | tcp_keepintvl | long |

+| unix_socket_path | string |
+
+| path_as_is | long |
+
+| proxy_service_name | string |
+
+| service_name | string |
+
+| default_protocol | string |
+
+| socks5_gssapi_service | string |
+
 | netrc | long | ignored, optional, required

 | userpwd | string |

 | proxyuserpwd | string |

-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

 | netrc_file | string |

@@ -116,7 +126,7 @@

 | cookiejar | string |

-| http_version | long | none, 1_0, 1_1
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls

 | cookiesession | long |

@@ -144,6 +154,10 @@

 | headeropt | mask | unified, separate

+| pipewait | long |
+
+| stream_weight | long |
+
 | mail_from | string |

 | mail_auth | string |
@@ -302,12 +316,18 @@

 | gssapi_delegation | long | none, policy_flag, flag

-| ssl_options | long | allow_beast
+| ssl_options | long | allow_beast, no_revoke

 | ssl_enable_alpn | long |

 | ssl_enable_npn | long |

+| pinnedpublickey | string |
+
+| ssl_verifystatus | long |
+
+| ssl_falsestart | long |
+
 | ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |
@@ -7654,8 +7654,8 @@ struct t_hook *weechat_hook_process (const char *command,

 Paramètres :

-* 'command' : commande à lancer dans le processus fils ou URL
-  _(WeeChat ≥ 0.3.7)_ (voir ci-dessous)
+* 'command' : commande à lancer dans le processus fils, URL _(WeeChat ≥ 0.3.7)_
+  ou fonction _(WeeChat ≥ 1.5)_ (voir ci-dessous)
 * 'timeout' : timeout pour la commande (en millisecondes) : après ce délai, le
  processus fils est tué (0 signifie pas de limite)
 * 'callback' : fonction appelée quand des données du fils sont disponibles, or
@@ -7671,14 +7671,19 @@ Paramètres :
 **** '2' : erreur de transfert
 **** '3' : pas assez de mémoire
 **** '4' : erreur avec un fichier
-*** '< 0' : 'WEECHAT_HOOK_PROCESS_RUNNING' (données disponibles, mais le
-    fils tourne toujours) ou 'WEECHAT_HOOK_PROCESS_ERROR' (erreur en lançant
-    la commande)
+*** '< 0' :
+**** 'WEECHAT_HOOK_PROCESS_RUNNING' : données disponibles, mais le fils tourne
+     toujours
+**** 'WEECHAT_HOOK_PROCESS_ERROR' : erreur en lançant la commande
+**** 'WEECHAT_HOOK_PROCESS_CHILD': le "callback" est appelé dans le processus
+     fils
 ** 'out' : sortie standard de la commande (stdout)
 ** 'err' : erreurs de la commande (stderr)
 ** valeur de retour :
 *** 'WEECHAT_RC_OK'
 *** 'WEECHAT_RC_ERROR'
+*** code retour du processus fils (dans le cas d'une fonction avec "func:" dans
+    la commande)
 * 'callback_pointer' : pointeur donné au "callback" lorsqu'il est appelé par
  WeeChat
 * 'callback_data' : pointeur donné au "callback" lorsqu'il est appelé par
@@ -7699,6 +7704,17 @@ pour télécharger le contenu de l'URL _(WeeChat ≥ 0.3.7)_.
 Des options pour l'URL sont possibles avec la fonction
 <<_hook_process_hashtable,weechat_hook_process_hashtable>>.

+La commande peut aussi être le nom d'une fonction avec le format : "func:nom",
+pour exécuter la fonction "nom" _(WeeChat ≥ 1.5)_. Cette fonction reçoit un
+paramètre ('data') et doit retourner une chaîne de caractères, qui sera envoyée
+au "callback". +
+Dans l'API C, le "callback" est appelé avec le code retour qui vaut
+'WEECHAT_HOOK_PROCESS_CHILD', cela signifie que le "callback" tourne dans le
+processus fils (après le fork). +
+Dans l'API script, la fonction 'nom' est appelée directement et le résultat
+(chaîne de caractères) est envoyé au "callback" (comme la sortie d'une commande
+externe).
+
 [TIP]
 Si vous souhaitez récupérer des infos à propos de WeeChat (comme la version
 stable actuelle, le dernier commit git, etc...), vous pouvez utiliser les URLs
@@ -7720,6 +7736,7 @@ Exemple en C :

 [source,C]
 ----
+/* exemple avec une commande externe */
 int
 my_process_cb (const void *pointer, void *data, const char *command,
               int return_code, const char *out, const char *err)
@@ -7750,6 +7767,52 @@ my_process_cb (const void *pointer, void *data, const char *command,

 struct t_hook *my_process_hook = weechat_hook_process ("ls", 5000,
                                                       &my_process_cb, NULL, NULL);
+
+/* exemple avec le "callback" appelé dans le processus fils */
+int
+my_process_cb (const void *pointer, void *data, const char *command,
+               int return_code, const char *out, const char *err)
+{
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        /* faire quelque chose de bloquant... */
+        /* ... */
+
+        /* la sortie "stdout" sera envoyée comme "out" au "callback" parent */
+        printf ("ceci est le résultat");
+
+        /* code retour du processus */
+        return 0;
+    }
+    else
+    {
+        if (return_code == WEECHAT_HOOK_PROCESS_ERROR)
+        {
+            weechat_printf (NULL, "Erreur avec la commande '%s'", command);
+            return WEECHAT_RC_OK;
+        }
+
+        if (return_code >= 0)
+        {
+            weechat_printf (NULL, "return_code = %d", return_code);
+        }
+
+        if (out)
+        {
+            weechat_printf (NULL, "stdout : %s", out);
+        }
+
+        if (err)
+        {
+            weechat_printf (NULL, "stderr : %s", err);
+        }
+
+        return WEECHAT_RC_OK;
+    }
+}
+
+struct t_hook *my_process_hook = weechat_hook_process ("func:get_status", 5000,
+                                                       &my_process_cb, NULL, NULL);
 ----

 Script (Python) :
@@ -7759,7 +7822,7 @@ Script (Python) :
 # prototype
 hook = weechat.hook_process(command, timeout, callback, callback_data)

-# exemple
+# exemple avec une commande externe
 def my_process_cb(data, command, return_code, out, err):
    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
        weechat.prnt("", "Erreur avec la commande '%s'" % command)
@@ -7773,6 +7836,26 @@ def my_process_cb(data, command, return_code, out, err):
    return weechat.WEECHAT_RC_OK

 hook = weechat.hook_process("ls", 5000, "my_process_cb", "")
+
+# exemple avec une fonction du script
+def get_status(data):
+    # faire quelque chose de bloquant...
+    # ...
+    return "ceci est le résultat"
+
+def my_process_cb(data, command, return_code, out, err):
+    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
+        weechat.prnt("", "Erreur avec la commande '%s'" % command)
+        return weechat.WEECHAT_RC_OK
+    if return_code >= 0:
+        weechat.prnt("", "return_code = %d" % return_code)
+    if out != "":
+        weechat.prnt("", "stdout : %s" % out)
+    if err != "":
+        weechat.prnt("", "stderr : %s" % err)
+    return weechat.WEECHAT_RC_OK
+
+hook = weechat.hook_process("func:get_status", 5000, "my_process_cb", "")
 ----

 ==== hook_process_hashtable
@@ -75,8 +75,9 @@ $ git clone https://github.com/weechat/weechat.git
 $ cd weechat
 ----

-NOTE : Plus tard, vous pourrez utiliser la commande "`git pull`" dans ce
-répertoire pour obtenir juste les deltas avec la version d'aujourd'hui.
+[NOTE]
+Plus tard, vous pourrez utiliser la commande "`git pull`" dans ce répertoire
+pour obtenir juste les deltas avec la version d'aujourd'hui.

 Sinon vous pouvez installer le paquet 'devel' :

@@ -2306,8 +2306,8 @@ mécanismes :
 * 'plain' : mot de passe en clair (par défaut)
 * 'ecdsa-nist256p-challenge' : challenge avec clé publique/privée
 * 'external' : certificat SSL côté client
-* 'dh-blowfish' : mot de passe chiffré avec blowfish
-* 'dh-aes' : mot de passe chiffré avec AES
+* 'dh-blowfish' : mot de passe chiffré avec blowfish (*non sûr*, non recommandé)
+* 'dh-aes' : mot de passe chiffré avec AES (*non sûr*, non recommandé)

 [NOTE]
 La librairie "gcrypt" est requise lors de la compilation de WeeChat pour
@@ -42,14 +42,12 @@

 | address_scope | long |

-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

 | noproxy | string |

-| socks5_gssapi_service | string |
-
 | socks5_gssapi_nec | long |

 | tcp_keepalive | long |
@@ -58,15 +56,27 @@

 | tcp_keepintvl | long |

+| unix_socket_path | string |
+
+| path_as_is | long |
+
+| proxy_service_name | string |
+
+| service_name | string |
+
+| default_protocol | string |
+
+| socks5_gssapi_service | string |
+
 | netrc | long | ignored, optional, required

 | userpwd | string |

 | proxyuserpwd | string |

-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

 | netrc_file | string |

@@ -116,7 +126,7 @@

 | cookiejar | string |

-| http_version | long | none, 1_0, 1_1
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls

 | cookiesession | long |

@@ -144,6 +154,10 @@

 | headeropt | mask | unified, separate

+| pipewait | long |
+
+| stream_weight | long |
+
 | mail_from | string |

 | mail_auth | string |
@@ -302,12 +316,18 @@

 | gssapi_delegation | long | none, policy_flag, flag

-| ssl_options | long | allow_beast
+| ssl_options | long | allow_beast, no_revoke

 | ssl_enable_alpn | long |

 | ssl_enable_npn | long |

+| pinnedpublickey | string |
+
+| ssl_verifystatus | long |
+
+| ssl_falsestart | long |
+
 | ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |
@@ -2298,7 +2298,7 @@ Argomenti:
 // TRANSLATION MISSING
 * 'length': max number of UTF-8 chars to check; if ≤ 0, the whole string is
  checked _(WeeChat ≥ 1.4)_
-* 'error': se non NULL, '*error*' è impostato con il puntatore al primo
+* 'error': se non NULL, '*error' è impostato con il puntatore al primo
  carattere UTF-8 non valido nella stringa, se esiste

 Valore restituito:
@@ -7718,8 +7718,9 @@ struct t_hook *weechat_hook_process (const char *command,

 Argomenti:

-* 'command': comando da avviare nel processo figlio o URL
-  _(WeeChat ≥ 0.3.7)_, segue:
+// TRANSLATION MISSING
+* 'command': command to launch in child process, URL _(WeeChat ≥ 0.3.7)_ or
+  function _(WeeChat ≥ 1.5)_ (see below)
 * 'timeout': timeout per il comando (in millisecondi): dopo questo timeout,
  il processo figlio viene terminato (0 indica nessun timeout)
 * 'callback': funzione chiamata quando i dati dal processo figlio sono disponibili,
@@ -7735,14 +7736,19 @@ Argomenti:
 **** '2': errore di trasferimento
 **** '3': memoria non sufficiente
 **** '4': errore con un file
-*** '< 0': 'WEECHAT_HOOK_PROCESS_RUNNING' (dati disponibili, ma figlio
-    ancora in esecuzione) o 'WEECHAT_HOOK_PROCESS_ERROR' (errore nella
-    esecuzione del comando)
+*** '< 0':
+**** 'WEECHAT_HOOK_PROCESS_RUNNING': dati disponibili, ma figlio ancora in
+     esecuzione)
+**** 'WEECHAT_HOOK_PROCESS_ERROR': errore nella esecuzione del comando
+// TRANSLATION MISSING
+**** 'WEECHAT_HOOK_PROCESS_CHILD': callback is called in the child process
 ** 'out': output standard del comando (stdout)
 ** 'err': output di errore del comando (stderr)
 ** valore restituito:
 *** 'WEECHAT_RC_OK'
 *** 'WEECHAT_RC_ERROR'
+// TRANSLATION MISSING
+*** child process return code (in case of function with "func:" in command)
 * 'callback_pointer': puntatore fornito alla callback quando chiamata da WeeChat
 // TRANSLATION MISSING
 * 'callback_data': puntatore fornito alla callback quando chiamata da WeeChat;
@@ -7761,6 +7767,16 @@ scaricare il contenuto dell'URL _(WeeChat ≥ 0.3.7)_. Le opzioni per
 un URL sono disponibili con la funzione
 <<_hook_process_hashtable,weechat_hook_process_hashtable>>.

+// TRANSLATION MISSING
+The command can also be a function name with format: "func:name", to execute
+the function "name" _(WeeChat ≥ 1.5)_. This function receives a single argument
+('data') and must return a string, which is sent to the callback. +
+In C API, the callback is called with the return code set to
+'WEECHAT_HOOK_PROCESS_CHILD', which means the callback is running in the child
+process (after fork). +
+In scripting API, the function 'name' is called directly and its result
+(string) is sent to the callback (like the output of an external command).
+
 // TRANSLATION MISSING
 [TIP]
 If you want to retrieve infos about WeeChat (like current stable version,
@@ -7782,6 +7798,7 @@ Esempio in C:

 [source,C]
 ----
+/* example with an external command */
 int
 my_process_cb (const void *pointer, void *data, const char *command,
               int return_code, const char *out, const char *err)
@@ -7812,6 +7829,52 @@ my_process_cb (const void *pointer, void *data, const char *command,

 struct t_hook *my_process_hook = weechat_hook_process ("ls", 5000,
                                                       &my_process_cb, NULL, NULL);
+
+/* example with the callback called in the child process */
+int
+my_process_cb (const void *pointer, void *data, const char *command,
+               int return_code, const char *out, const char *err)
+{
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        /* do something blocking... */
+        /* ... */
+
+        /* the stdout will be sent as "out" in the parent callback */
+        printf ("this is the result");
+
+        /* return code of the process */
+        return 0;
+    }
+    else
+    {
+        if (return_code == WEECHAT_HOOK_PROCESS_ERROR)
+        {
+            weechat_printf (NULL, "Error with command '%s'", command);
+            return WEECHAT_RC_OK;
+        }
+
+        if (return_code >= 0)
+        {
+            weechat_printf (NULL, "return_code = %d", return_code);
+        }
+
+        if (out)
+        {
+            weechat_printf (NULL, "stdout: %s", out);
+        }
+
+        if (err)
+        {
+            weechat_printf (NULL, "stderr: %s", err);
+        }
+
+        return WEECHAT_RC_OK;
+    }
+}
+
+struct t_hook *my_process_hook = weechat_hook_process ("func:get_status", 5000,
+                                                       &my_process_cb, NULL, NULL);
 ----

 Script (Python):
@@ -7821,7 +7884,7 @@ Script (Python):
 # prototipo
 hook = weechat.hook_process(command, timeout, callback, callback_data)

-# esempio
+# example with an external command
 def my_process_cb(data, command, return_code, out, err):
    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
        weechat.prnt("", "Error with command '%s'" % command)
@@ -7835,6 +7898,26 @@ def my_process_cb(data, command, return_code, out, err):
    return weechat.WEECHAT_RC_OK

 hook = weechat.hook_process("ls", 5000, "my_process_cb", "")
+
+# example with a script function
+def get_status(data):
+    # do something blocking...
+    # ...
+    return "this is the result"
+
+def my_process_cb(data, command, return_code, out, err):
+    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
+        weechat.prnt("", "Error with command '%s'" % command)
+        return weechat.WEECHAT_RC_OK
+    if return_code >= 0:
+        weechat.prnt("", "return_code = %d" % return_code)
+    if out != "":
+        weechat.prnt("", "stdout: %s" % out)
+    if err != "":
+        weechat.prnt("", "stderr: %s" % err)
+    return weechat.WEECHAT_RC_OK
+
+hook = weechat.hook_process("func:get_status", 5000, "my_process_cb", "")
 ----

 ==== hook_process_hashtable
@@ -80,8 +80,9 @@ $ git clone https://github.com/weechat/weechat.git
 $ cd weechat
 ----

-NOTA: In seguito, si può eseguire "`git pull`" in questa directory per
-ricevere gli ultimi aggiornamenti.
+[NOTE]
+In seguito, si può eseguire "`git pull`" in questa directory per ricevere gli
+ultimi aggiornamenti.

 Altrimenti si può scaricare ed estrarre il pacchetto 'devel':

@@ -2350,9 +2350,9 @@ WeeChat supports SASL authentication, using different mechanisms:
 * 'ecdsa-nist256p-challenge': challenge with public/private key
 * 'external': certificato SSL da lato client
 // TRANSLATION MISSING
-* 'dh-blowfish': blowfish encrypted password
+* 'dh-blowfish': blowfish encrypted password (*insecure*, not recommended)
 // TRANSLATION MISSING
-* 'dh-aes': AES encrypted password
+* 'dh-aes': AES encrypted password (*insecure*, not recommended)

 [NOTE]
 La libreria "gcrypt" è richiesta per compilare WeeChat al fine di usare il
@@ -42,14 +42,12 @@

 | address_scope | long |

-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

 | noproxy | string |

-| socks5_gssapi_service | string |
-
 | socks5_gssapi_nec | long |

 | tcp_keepalive | long |
@@ -58,15 +56,27 @@

 | tcp_keepintvl | long |

+| unix_socket_path | string |
+
+| path_as_is | long |
+
+| proxy_service_name | string |
+
+| service_name | string |
+
+| default_protocol | string |
+
+| socks5_gssapi_service | string |
+
 | netrc | long | ignored, optional, required

 | userpwd | string |

 | proxyuserpwd | string |

-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

 | netrc_file | string |

@@ -116,7 +126,7 @@

 | cookiejar | string |

-| http_version | long | none, 1_0, 1_1
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls

 | cookiesession | long |

@@ -144,6 +154,10 @@

 | headeropt | mask | unified, separate

+| pipewait | long |
+
+| stream_weight | long |
+
 | mail_from | string |

 | mail_auth | string |
@@ -302,12 +316,18 @@

 | gssapi_delegation | long | none, policy_flag, flag

-| ssl_options | long | allow_beast
+| ssl_options | long | allow_beast, no_revoke

 | ssl_enable_alpn | long |

 | ssl_enable_npn | long |

+| pinnedpublickey | string |
+
+| ssl_verifystatus | long |
+
+| ssl_falsestart | long |
+
 | ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |
@@ -2219,7 +2219,7 @@ int weechat_utf8_is_valid (const char *string, int length, char **error);
 * 'string': 文字列
 * 'length': 確認する UTF-8 文字の最大文字数; これを 0 以下に設定した場合、文字列中のすべての文字を確認します
  _(WeeChat バージョン 1.4 以上で利用可)_
-* 'error': NULL でない場合は '*error*'
+* 'error': NULL でない場合は '*error'
  は文字列に含まれる最初の妥当でない UTF-8 文字へのポインタ

 戻り値:
@@ -7515,8 +7515,8 @@ struct t_hook *weechat_hook_process (const char *command,

 引数:

-* 'command': 子プロセスで実行するコマンドまたは
-  URL _(WeeChat バージョン 0.3.7 以上で利用可)_ (以下を参照)
+* 'command': 子プロセスで実行するコマンド、URL _(WeeChat バージョン 0.3.7 以上で利用可)_
+  または関数 _(WeeChat バージョン 1.5 以上で利用可)_ (下記参照)
 * 'timeout': コマンドのタイムアウト (ミリ秒):
  このタイムアウトを過ぎたら、子プロセスを kill します (タイムアウトさせない場合は 0)
 * 'callback':
@@ -7531,13 +7531,16 @@ struct t_hook *weechat_hook_process (const char *command,
 **** '2': 転送エラー
 **** '3': メモリ不足
 **** '4': ファイルに関するエラー
-*** '< 0': 'WEECHAT_HOOK_PROCESS_RUNNING' (データは利用可能だが子プロセスは終了していない)
-    または 'WEECHAT_HOOK_PROCESS_ERROR' (コマンドの実行中にエラー)
+*** '< 0':
+**** 'WEECHAT_HOOK_PROCESS_RUNNING': データは利用可能だが子プロセスは終了していない
+**** 'WEECHAT_HOOK_PROCESS_ERROR': コマンドの起動中にエラー
+**** 'WEECHAT_HOOK_PROCESS_CHILD': 子プロセスからコールバックが呼び出された
 ** 'out': コマンドの標準出力 (stdout)
 ** 'err': コマンドの標準エラー出力 (stderr)
 ** 戻り値:
 *** 'WEECHAT_RC_OK'
 *** 'WEECHAT_RC_ERROR'
+*** 子プロセスのリターンコード ('command' に "func:" を指定して関数を実行した場合)
 * 'callback_pointer': WeeChat が 'callback' コールバックを呼び出す際にコールバックに渡すポインタ
 * 'callback_data': WeeChat が 'callback' コールバックを呼び出す際にコールバックに渡すポインタ;
  このポインタが NULL でない場合、このポインタは malloc (または類似の関数)
@@ -7554,6 +7557,15 @@ struct t_hook *weechat_hook_process (const char *command,
 の内容がダウンロードされます _(WeeChat バージョン 0.3.7 以上で利用可)_ 。<<_hook_process_hashtable,weechat_hook_process_hashtable>>
 関数を使えば URL に対してオプションを与えることもできます。

+'command' には関数名を指定することも可能です。"name" という関数を実行するには "func:name"
+のように指定します _(WeeChat バージョン 1.5 以上で利用可)_ 。ここで指定した関数 "name" は単独の引数 ('data')
+を受け取り、文字列を返すものでなければいけません。関数から返された文字列が 'callback' コールバックに送られます。 +
+C API の場合、'callback' コールバックが 'return_code' リターンコードに
+'WEECHAT_HOOK_PROCESS_CHILD' が設定された状態で呼び出されます。すなわち (フォークの後に)
+子プロセスが呼び出すのは関数 "name" ではなく 'callback' コールバックです。 +
+スクリプト API の場合、子プロセスが呼び出すのは関数 "name" であり、関数 "name" の戻り値 (文字列) が
+'callback' コールバックに送られます (関数の戻り値は外部コマンドを実行した場合の出力と同様に取り扱われます)。
+
 [TIP]
 WeeChat に関する情報 (例えば現在の安定版、最新の git コミット、...)
 が欲しい場合、https://weechat.org/dev/info に書かれている URL を使ってください
@@ -7573,6 +7585,7 @@ C 言語での使用例:

 [source,C]
 ----
+/* 外部コマンドを実行する例 */
 int
 my_process_cb (const void *pointer, void *data, const char *command,
               int return_code, const char *out, const char *err)
@@ -7603,6 +7616,52 @@ my_process_cb (const void *pointer, void *data, const char *command,

 struct t_hook *my_process_hook = weechat_hook_process ("ls", 5000,
                                                       &my_process_cb, NULL, NULL);
+
+/* 子プロセスからコールバックを呼び出す例 */
+int
+my_process_cb (const void *pointer, void *data, const char *command,
+               int return_code, const char *out, const char *err)
+{
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        /* 何かブロックを生じさせるようなことを実行... */
+        /* ... */
+
+        /* 親プロセスはこの標準出力の内容を "out" に設定して、コールバックを呼び出します */
+        printf ("this is the result");
+
+        /* このプロセスの戻り値 */
+        return 0;
+    }
+    else
+    {
+        if (return_code == WEECHAT_HOOK_PROCESS_ERROR)
+        {
+            weechat_printf (NULL, "Error with command '%s'", command);
+            return WEECHAT_RC_OK;
+        }
+
+        if (return_code >= 0)
+        {
+            weechat_printf (NULL, "return_code = %d", return_code);
+        }
+
+        if (out)
+        {
+            weechat_printf (NULL, "stdout: %s", out);
+        }
+
+        if (err)
+        {
+            weechat_printf (NULL, "stderr: %s", err);
+        }
+
+        return WEECHAT_RC_OK;
+    }
+}
+
+struct t_hook *my_process_hook = weechat_hook_process ("func:get_status", 5000,
+                                                       &my_process_cb, NULL, NULL);
 ----

 スクリプト (Python) での使用例:
@@ -7612,7 +7671,7 @@ struct t_hook *my_process_hook = weechat_hook_process ("ls", 5000,
 # プロトタイプ
 hook = weechat.hook_process(command, timeout, callback, callback_data)

-# 例
+# 外部コマンドを実行する例
 def my_process_cb(data, command, return_code, out, err):
    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
        weechat.prnt("", "Error with command '%s'" % command)
@@ -7626,6 +7685,26 @@ def my_process_cb(data, command, return_code, out, err):
    return weechat.WEECHAT_RC_OK

 hook = weechat.hook_process("ls", 5000, "my_process_cb", "")
+
+# スクリプト関数を実行する例
+def get_status(data):
+    # 何かブロックを生じさせるようなことを実行...
+    # ...
+    return "this is the result"
+
+def my_process_cb(data, command, return_code, out, err):
+    if return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
+        weechat.prnt("", "Error with command '%s'" % command)
+        return weechat.WEECHAT_RC_OK
+    if return_code >= 0:
+        weechat.prnt("", "return_code = %d" % return_code)
+    if out != "":
+        weechat.prnt("", "stdout: %s" % out)
+    if err != "":
+        weechat.prnt("", "stderr: %s" % err)
+    return weechat.WEECHAT_RC_OK
+
+hook = weechat.hook_process("func:get_status", 5000, "my_process_cb", "")
 ----

 ==== hook_process_hashtable
@@ -73,7 +73,8 @@ $ git clone https://github.com/weechat/weechat.git
 $ cd weechat
 ----

-注意: clone の後、このディレクトリ内で "`git pull`"
+[NOTE]
+clone の後、このディレクトリ内で "`git pull`"
 を実行すれば、最新のアップデートとの差分が更新されます。

 他の方法として 'devel' パッケージをダウンロードして展開する方法があります:
@@ -2228,8 +2228,8 @@ WeeChat は SASL 認証をサポートします、以下の認証メカニズム
 * 'plain': 平文パスワード (デフォルト)
 * 'ecdsa-nist256p-challenge': 公開鍵/秘密鍵を使うチャレンジ認証
 * 'external': クライアント側 SSL 証明書
-* 'dh-blowfish': blowfish 暗号パスワード
-* 'dh-aes': AES 暗号パスワード
+* 'dh-blowfish': blowfish 暗号パスワード (*危険* 、非推奨)
+* 'dh-aes': AES 暗号パスワード (*危険* 、非推奨)

 [NOTE]
 "dh-blowfish" メカニズムを利用する場合、"gcrypt" ライブラリが
@@ -18,9 +18,9 @@

 | irc | irc_nick | pobiera aktualny nick z serwera | nazwa serwera

-| irc | irc_nick_color | get nick color code (*deprecated* since version 1.5, replaced by "nick_color") | nazwa użytkownika
+| irc | irc_nick_color | pobierz kod koloru nicka (*przestarzałe* od wersji 1.5, zamienione przez "nick_color") | nazwa użytkownika

-| irc | irc_nick_color_name | get nick color name (*deprecated* since version 1.5, replaced by "nick_color_name") | nazwa użytkownika
+| irc | irc_nick_color_name | pobierz nazwę koloru nicka (*przestarzałe* od wersji 1.5, zamienione przez "nick_color_name") | nazwa użytkownika

 | irc | irc_nick_from_host | pobiera nick z hosta IRC | host IRC (jak `:nick!nazwa@serwer.com`)

@@ -42,14 +42,12 @@

 | address_scope | long |

-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs

 | noproxy | string |

-| socks5_gssapi_service | string |
-
 | socks5_gssapi_nec | long |

 | tcp_keepalive | long |
@@ -58,15 +56,27 @@

 | tcp_keepintvl | long |

+| unix_socket_path | string |
+
+| path_as_is | long |
+
+| proxy_service_name | string |
+
+| service_name | string |
+
+| default_protocol | string |
+
+| socks5_gssapi_service | string |
+
 | netrc | long | ignored, optional, required

 | userpwd | string |

 | proxyuserpwd | string |

-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

 | netrc_file | string |

@@ -116,7 +126,7 @@

 | cookiejar | string |

-| http_version | long | none, 1_0, 1_1
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls

 | cookiesession | long |

@@ -144,6 +154,10 @@

 | headeropt | mask | unified, separate

+| pipewait | long |
+
+| stream_weight | long |
+
 | mail_from | string |

 | mail_auth | string |
@@ -302,12 +316,18 @@

 | gssapi_delegation | long | none, policy_flag, flag

-| ssl_options | long | allow_beast
+| ssl_options | long | allow_beast, no_revoke

 | ssl_enable_alpn | long |

 | ssl_enable_npn | long |

+| pinnedpublickey | string |
+
+| ssl_verifystatus | long |
+
+| ssl_falsestart | long |
+
 | ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |
@@ -413,7 +413,7 @@
 ** wartości: 1 .. 10080 (domyślna wartość: `5`)

 * [[option_irc.network.sasl_fail_unavailable]] *irc.network.sasl_fail_unavailable*
-** opis: `cause SASL authentication failure when SASL is requested but unavailable on the server; when this option is enabled, it has effect only if option "sasl_fail" is set to "reconnect" or "disconnect" in the server`
+** opis: `powoduje niepowodzenie autentykacji SASL, kiedy została ona zarządana ale nie jest dostępna po stronie serwera; kiedy ta opcja jest włączona, ma ona wpływ tylko jeśli opcja "sasl_fail" jest ustawiona na "reconnect" lub "disconnect" dla serwera`
 ** typ: bool
 ** wartości: on, off (domyślna wartość: `on`)

@@ -558,7 +558,7 @@
 ** wartości: dowolny ciąg (domyślna wartość: `""`)

 * [[option_irc.server_default.sasl_fail]] *irc.server_default.sasl_fail*
-** opis: `action to perform if SASL authentication fails: "continue" to ignore the authentication problem, "reconnect" to schedule a reconnection to the server, "disconnect" to disconnect from server (see also option irc.network.sasl_fail_unavailable)`
+** opis: `akcja do wykonania jeśli uwierzytelnianie SASL się nie powiedzie: "continue" dla zignorowania problemu, "reconnect" ponownie połącz się z serwerem, "disconnect" odłącz od serwera (zobacz też opcję irc.network.sasl_fail_unavailable)`
 ** typ: liczba
 ** wartości: continue, reconnect, disconnect (domyślna wartość: `continue`)

@@ -28,7 +28,7 @@
 ** wartości: on, off (domyślna wartość: `off`)

 * [[option_logger.file.mask]] *logger.file.mask*
-** opis: `default file name mask for log files (format is "directory/to/file" or "file", without first "/" because "path" option is used to build complete path to file); local buffer variables are permitted (you should use only variables that are defined on all buffers, so for example you should NOT use $server nor $channel); date specifiers are permitted (see man strftime)`
+** opis: `domyślna maska nazw plików z logami (format to "ścieżka/do/pliku" lub "plik", bez pierwszego "/" ponieważ opcja "path" jest użyta do stworzenia kompletnej ścieżki do pliku); lokalne zmienne buforów dozwolone; (powinno się używać tylko zmiennych zdefiniowanych dla wszytkich buforów, na przykład nie należy używać $server ani $channel); określenia dla daty są dozwolone (zobacz man  strftime)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"$plugin.$name.weechatlog"`)

@@ -91,7 +91,7 @@ $HOME/.weechat/weechat.log::

 Autorem tej strony pomocy Sébastien Helleu <flashcode@flashtux.org>.

-Tłumaczenie Krzysztof Korościk <soltys@szluug.org>.
+Tłumaczenie Krzysztof Korościk <soltys1@gmail.com>.

 == PRAWA AUTORSKIE

@@ -8,7 +8,7 @@

 Tłumaczenie:

-* Krzysztof Korościk <soltys@szluug.org>, 2009-2016
+* Krzysztof Korościk <soltys1@gmail.com>, 2009-2016

 [NOTE]
 Ten dokument jest napisany dla WeeChat w wersji ≥ 0.3.0, ale powinien być używany
@@ -499,10 +499,9 @@ key[shift]).
 [[irc_ssl_connection]]
 === Mam problemy podczas połączenia z serwerem używającym SSL, co mogę zrobić?

-// TRANSLATION MISSING
-If you are using Mac OS X, you must install `openssl` from Homebrew.
-A CA file will be bootstrapped using certificates from the system keychain.
-You can then set the path to certificates in WeeChat:
+Jeśli używasz Mac OS X, musisz zainstalować `openssl` z Homebrew.
+Plik CA zostanie wygenerowany korzystając z systemowego keychaina.
+Możez natępnie ustawić ścierzkę do certyfikatów w WeeChat:

 ----
 /set weechat.network.gnutls_ca_file "/usr/local/etc/openssl/cert.pem"
@@ -8,7 +8,7 @@

 Tłumaczenie:

-* Krzysztof Korościk <soltys@szluug.org>, 2009-2016
+* Krzysztof Korościk <soltys1@gmail.com>, 2009-2016


 [[start]]
@@ -246,20 +246,17 @@ Wyjście z kanału (zostawiając otwarty bufor):
 /part [wiadomość pożegnalna]
 ----

-// TRANSLATION MISSING
-Close a server, channel or private buffer (`/close` is an alias for
+Zamknij serwer, kanał albo prywatny bufor (`/close` to alias dla
 `/buffer close`):

 ----
 /close
 ----

-// TRANSLATION MISSING
 [WARNING]
-Closing the server buffer will close all channel/private buffers.
+Zamknięcie buforu serwera poskutkuje zamknięciem wszystkich buforów prywatnych/kanałów.

-// TRANSLATION MISSING
-Disconnect from server, on the server buffer:
+Rozłączanie się z serwerem, w buforze serwera:

 ----
 /disconnect
@@ -9,7 +9,7 @@

 Tłumaczenie:

-* Krzysztof Korościk <soltys@szluug.org>, 2009-2016
+* Krzysztof Korościk <soltys1@gmail.com>, 2009-2016


 Ten dokument opisuje klienta rozmów WeeChat, który jest częścią WeeChat.
@@ -8,7 +8,7 @@

 Tłumaczenie:

-* Krzysztof Korościk <soltys@szluug.org>, 2009-2016
+* Krzysztof Korościk <soltys1@gmail.com>, 2009-2016


 [[purpose]]
@@ -76,7 +76,8 @@ $ git clone https://github.com/weechat/weechat.git
 $ cd weechat
 ----

-UWAGA: Później możesz wykonać w tym katalogu "`git pull`", aby pobrać najnowsze
+[NOTE]
+Później możesz wykonać w tym katalogu "`git pull`", aby pobrać najnowsze
 poprawki.

 Oczywiście możesz pobrać paczkę oznaczoną jako 'devel':
@@ -9,7 +9,7 @@

 Tłumaczenie:

-* Krzysztof Korościk <soltys@szluug.org>, 2009-2016
+* Krzysztof Korościk <soltys1@gmail.com>, 2009-2016


 Ten dokument opisuje klienta rozmów WeeChat, będącego częścią WeeChat.
@@ -2250,7 +2250,9 @@ WeeChat wspiera uwierzytelnianie SASL, używając różnych mechanizmów:
 * 'ecdsa-nist256p-challenge': klucz prywatny/publiczny
 * 'external': certyfikat SSL po stronie klienta
 * 'dh-blowfish': hasło zaszyfrowane algorytmem blowfish
+  (*niebezpieczne*, nie zalecane)
 * 'dh-aes': hasło zaszyfrowane algorytmem AES
+  (*niebezpieczne*, nie zalecane)

 [NOTE]
 Biblioteka "gcrypt" jest wymagana podczas kompilacji WeeChat w celu dodania
@@ -26,6 +26,7 @@ set(PO_FILES
  it.po
  ja.po
  pl.po
+  pt.po
  pt_BR.po
  ru.po
  tr.po
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2016 Krzysztof Koroscik <soltys@szluug.org>
+# Copyright (C) 2009-2016 Krzysztof Koroscik <soltys1@gmail.com>
 # Copyright (C) 2010 B.J. Stobiecki <bartek@stobiecki.eu>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
 "POT-Creation-Date: 2016-04-04 14:36+0200\n"
 "PO-Revision-Date: 2016-03-17 20:43+0100\n"
-"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
+"Last-Translator: Krzysztof Korościk <soltys1@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -7767,7 +7767,6 @@ msgid "timeout (in seconds) before giving up SASL authentication"
 msgstr ""
 "czas oczekiwania (w sekundach) przed zaprzestaniem uwierzytelniania SASL"

-#, fuzzy
 msgid ""
 "action to perform if SASL authentication fails: \"continue\" to ignore the "
 "authentication problem, \"reconnect\" to schedule a reconnection to the "
@@ -7776,7 +7775,7 @@ msgid ""
 msgstr ""
 "akcja do wykonania jeśli uwierzytelnianie SASL się nie powiedzie: \"continue"
 "\" dla zignorowania problemu, \"reconnect\" ponownie połącz się z serwerem, "
-"\"disconnect\" odłącz od serwera"
+"\"disconnect\" odłącz od serwera (zobacz też opcję irc.network.sasl_fail_unavailable)"

 msgid "automatically connect to server when WeeChat is starting"
 msgstr "automatycznie połącz się z serwerem przy uruchamianiu WeeChat"
@@ -8496,6 +8495,10 @@ msgid ""
 "the server; when this option is enabled, it has effect only if option "
 "\"sasl_fail\" is set to \"reconnect\" or \"disconnect\" in the server"
 msgstr ""
+"powoduje niepowodzenie autentykacji SASL, kiedy została ona zarządana ale "
+"nie jest dostępna po stronie serwera; kiedy ta opcja jest włączona, ma ona "
+"wpływ tylko jeśli opcja \"sasl_fail\" jest ustawiona na \"reconnect\" lub "
+"\"disconnect\" dla serwera"

 msgid "send unknown commands to server"
 msgstr "wysyłaj nieznane komendy do serwera"
@@ -8572,11 +8575,15 @@ msgid ""
 "get nick color code (*deprecated* since version 1.5, replaced by \"nick_color"
 "\")"
 msgstr ""
+"pobierz kod koloru nicka (*przestarzałe* od wersji 1.5, zamienione przez "
+"\"nick_color\")"

 msgid ""
 "get nick color name (*deprecated* since version 1.5, replaced by "
 "\"nick_color_name\")"
 msgstr ""
+"pobierz nazwę koloru nicka (*przestarzałe* od wersji 1.5, zamienione przez "
+"\"nick_color_name\")"

 msgid "get buffer pointer for an IRC server/channel/nick"
 msgstr "pobiera wskaźnik dla serwera/kanału/nicku IRC"
@@ -9630,7 +9637,6 @@ msgstr ""
 "zapisuje informacje w pliku z logami o rozpoczęciu i zakończeniu logowania "
 "buforu"

-#, fuzzy
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
 "\"file\", without first \"/\" because \"path\" option is used to build "
@@ -9642,7 +9648,9 @@ msgstr ""
 "domyślna maska nazw plików z logami (format to \"ścieżka/do/pliku\" lub "
 "\"plik\", bez pierwszego \"/\" ponieważ opcja \"path\" jest użyta do "
 "stworzenia kompletnej ścieżki do pliku); lokalne zmienne buforów dozwolone; "
-"określenia dla daty są dozwolone (zobacz man  strftime)"
+"(powinno się używać tylko zmiennych zdefiniowanych dla wszytkich buforów, "
+"na przykład nie należy używać $server ani $channel); określenia dla daty "
+"są dozwolone (zobacz man  strftime)"

 msgid "use only lower case for log filenames"
 msgstr "używaj tylko małych liter dla nazw plików z logami"
@@ -76,6 +76,8 @@ int real_delete_pending = 0;           /* 1 if some hooks must be deleted   */

 struct pollfd *hook_fd_pollfd = NULL;  /* file descriptors for poll()       */
 int hook_fd_pollfd_count = 0;          /* number of file descriptors        */
+int hook_process_pending = 0;          /* 1 if there are some process to    */
+                                       /* run (via fork)                    */


 void hook_process_run (struct t_hook *hook_process);
@@ -1405,6 +1407,8 @@ hook_fd_exec ()

    /* perform the poll() */
    timeout = hook_timer_get_time_to_next ();
+    if (hook_process_pending)
+        timeout = 0;
    ready = poll (hook_fd_pollfd, num_fd, timeout);
    if (ready <= 0)
        return;
@@ -1547,7 +1551,10 @@ hook_process_hashtable (struct t_weechat_plugin *plugin,
                         new_hook_process->timeout);
    }

-    hook_process_run (new_hook);
+    if (strncmp (new_hook_process->command, "func:", 5) == 0)
+        hook_process_pending = 1;
+    else
+        hook_process_run (new_hook);

    return new_hook;

@@ -1656,6 +1663,16 @@ hook_process_child (struct t_hook *hook_process)
        }
        rc = weeurl_download (ptr_url, HOOK_PROCESS(hook_process, options));
    }
+    else if (strncmp (HOOK_PROCESS(hook_process, command), "func:", 5) == 0)
+    {
+        /* run a function (via the hook callback) */
+        rc = (int) (HOOK_PROCESS(hook_process, callback))
+            (hook_process->callback_pointer,
+             hook_process->callback_data,
+             HOOK_PROCESS(hook_process, command),
+             WEECHAT_HOOK_PROCESS_CHILD,
+             NULL, NULL);
+    }
    else
    {
        /* launch command */
@@ -2142,6 +2159,39 @@ error:
    unhook (hook_process);
 }

+/*
+ * Executes all process commands pending.
+ */
+
+void
+hook_process_exec ()
+{
+    struct t_hook *ptr_hook, *next_hook;
+
+    hook_exec_start ();
+
+    ptr_hook = weechat_hooks[HOOK_TYPE_PROCESS];
+    while (ptr_hook)
+    {
+        next_hook = ptr_hook->next_hook;
+
+        if (!ptr_hook->deleted
+            && !ptr_hook->running
+            && (HOOK_PROCESS(ptr_hook, child_pid) == 0))
+        {
+            ptr_hook->running = 1;
+            hook_process_run (ptr_hook);
+            ptr_hook->running = 0;
+        }
+
+        ptr_hook = next_hook;
+    }
+
+    hook_exec_end ();
+
+    hook_process_pending = 0;
+}
+
 /*
 * Hooks a connection to a peer (using fork).
 *
@@ -505,6 +505,7 @@ extern struct t_hook *hook_process_hashtable (struct t_weechat_plugin *plugin,
                                              t_hook_callback_process *callback,
                                              const void *callback_pointer,
                                              void *callback_data);
+extern void hook_process_exec ();
 extern struct t_hook *hook_connect (struct t_weechat_plugin *plugin,
                                    const char *proxy, const char *address,
                                    int port, int ipv6, int retry,
@@ -46,7 +46,7 @@
 char *url_type_string[] = { "string", "long", "long long", "mask" };

 /*
- * Constants/options for Curl 7.38.0
+ * Constants/options for Curl 7.49.0
 * (this list of options must be updated on every new Curl release)
 */

@@ -103,6 +103,10 @@ struct t_url_constant url_protocols[] =
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071502 /* 7.21.2 */
    URL_DEF_CONST(PROTO, GOPHER),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072800 /* 7.40.0 */
+    URL_DEF_CONST(PROTO, SMB),
+    URL_DEF_CONST(PROTO, SMBS),
 #endif
    { NULL, 0 },
 };
@@ -123,7 +127,6 @@ struct t_url_constant url_auth[] =
    URL_DEF_CONST(AUTH, NONE),
    URL_DEF_CONST(AUTH, BASIC),
    URL_DEF_CONST(AUTH, DIGEST),
-    URL_DEF_CONST(AUTH, GSSNEGOTIATE),
    URL_DEF_CONST(AUTH, NTLM),
    URL_DEF_CONST(AUTH, ANY),
    URL_DEF_CONST(AUTH, ANYSAFE),
@@ -137,6 +140,9 @@ struct t_url_constant url_auth[] =
 #if LIBCURL_VERSION_NUM >= 0x071600 /* 7.22.0 */
    URL_DEF_CONST(AUTH, NTLM_WB),
 #endif
+#if LIBCURL_VERSION_NUM >= 0x070A06 && LIBCURL_VERSION_NUM < 0x072600 /* 7.10.6 - 7.38.0 */
+    URL_DEF_CONST(AUTH, GSSNEGOTIATE),
+#endif
 #if LIBCURL_VERSION_NUM >= 0x072600 /* 7.38.0 */
    URL_DEF_CONST(AUTH, NEGOTIATE),
 #endif
@@ -167,6 +173,18 @@ struct t_url_constant url_http_version[] =
    URL_DEF_CONST(_HTTP_VERSION, NONE),
    URL_DEF_CONST(_HTTP_VERSION, 1_0),
    URL_DEF_CONST(_HTTP_VERSION, 1_1),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
+    URL_DEF_CONST(_HTTP_VERSION, 2_0),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072B00 /* 7.43.0 */
+    URL_DEF_CONST(_HTTP_VERSION, 2),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072F00 /* 7.47.0 */
+    URL_DEF_CONST(_HTTP_VERSION, 2TLS),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x073100 /* 7.49.0 */
+    URL_DEF_CONST(_HTTP_VERSION, 2_PRIOR_KNOWLEDGE),
 #endif
    { NULL, 0 },
 };
@@ -268,6 +286,9 @@ struct t_url_constant url_ssl_options[] =
 {
 #if LIBCURL_VERSION_NUM >= 0x071900 /* 7.25.0 */
    URL_DEF_CONST(SSLOPT, ALLOW_BEAST),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072C00 /* 7.44.0 */
+    URL_DEF_CONST(SSLOPT, NO_REVOKE),
 #endif
    { NULL, 0 },
 };
@@ -365,7 +386,6 @@ struct t_url_option url_options[] =
    URL_DEF_OPTION(PROTOCOLS, MASK, url_protocols),
    URL_DEF_OPTION(REDIR_PROTOCOLS, MASK, url_protocols),
    URL_DEF_OPTION(NOPROXY, STRING, NULL),
-    URL_DEF_OPTION(SOCKS5_GSSAPI_SERVICE, STRING, NULL),
    URL_DEF_OPTION(SOCKS5_GSSAPI_NEC, LONG, NULL),
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071900 /* 7.25.0 */
@@ -373,6 +393,25 @@ struct t_url_option url_options[] =
    URL_DEF_OPTION(TCP_KEEPIDLE, LONG, NULL),
    URL_DEF_OPTION(TCP_KEEPINTVL, LONG, NULL),
 #endif
+#if LIBCURL_VERSION_NUM >= 0x072800 /* 7.40.0 */
+    URL_DEF_OPTION(UNIX_SOCKET_PATH, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072A00 /* 7.42.0 */
+    URL_DEF_OPTION(PATH_AS_IS, LONG, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072B00 /* 7.43.0 */
+    URL_DEF_OPTION(PROXY_SERVICE_NAME, STRING, NULL),
+    URL_DEF_OPTION(SERVICE_NAME, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072D00 /* 7.45.0 */
+    URL_DEF_OPTION(DEFAULT_PROTOCOL, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071304 && LIBCURL_VERSION_NUM < 0x073100 /* 7.19.4 - 7.49.0 */
+    URL_DEF_OPTION(SOCKS5_GSSAPI_SERVICE, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x073100 /* 7.49.0 */
+    URL_DEF_OPTION(TCP_FASTOPEN, LONG, NULL),
+#endif

    /*
     * name and password options (authentication)
@@ -480,6 +519,12 @@ struct t_url_option url_options[] =
    URL_DEF_OPTION(HEADEROPT, MASK, url_header),
    /*URL_DEF_OPTION(PROXYHEADER, LIST, NULL),*/
 #endif
+#if LIBCURL_VERSION_NUM >= 0x072B00 /* 7.43.0 */
+    URL_DEF_OPTION(PIPEWAIT, LONG, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072E00 /* 7.46.0 */
+    URL_DEF_OPTION(STREAM_WEIGHT, LONG, NULL),
+#endif

    /*
     * SMTP options
@@ -498,6 +543,9 @@ struct t_url_option url_options[] =
 #if LIBCURL_VERSION_NUM >= 0x071304 /* 7.19.4 */
    URL_DEF_OPTION(TFTP_BLKSIZE, LONG, NULL),
 #endif
+#if LIBCURL_VERSION_NUM >= 0x073000 /* 7.48.0 */
+    URL_DEF_OPTION(TFTP_NO_OPTIONS, LONG, NULL),
+#endif

    /*
     * FTP options
@@ -637,6 +685,9 @@ struct t_url_option url_options[] =
    URL_DEF_OPTION(DNS_LOCAL_IP4, STRING, NULL),
    URL_DEF_OPTION(DNS_LOCAL_IP6, STRING, NULL),
 #endif
+#if LIBCURL_VERSION_NUM >= 0x073100 /* 7.49.0 */
+    /*URL_DEF_OPTION(CONNECT_TO, LIST, NULL),*/
+#endif

    /*
     * SSL and security options
@@ -695,6 +746,15 @@ struct t_url_option url_options[] =
    URL_DEF_OPTION(SSL_ENABLE_ALPN, LONG, NULL),
    URL_DEF_OPTION(SSL_ENABLE_NPN, LONG, NULL),
 #endif
+#if LIBCURL_VERSION_NUM >= 0x072700 /* 7.39.0 */
+    URL_DEF_OPTION(PINNEDPUBLICKEY, STRING, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072900 /* 7.41.0 */
+    URL_DEF_OPTION(SSL_VERIFYSTATUS, LONG, NULL),
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072A00 /* 7.42.0 */
+    URL_DEF_OPTION(SSL_FALSESTART, LONG, NULL),
+#endif

    /*
     * SSH options
@@ -422,6 +422,9 @@ gui_main_loop ()

        /* execute fd hooks */
        hook_fd_exec ();
+
+        /* run process (with fork) */
+        hook_process_exec ();
    }

    /* remove keyboard hook */
@@ -2171,14 +2171,33 @@ weechat_guile_api_hook_process_cb (const void *pointer, void *data,
 {
    struct t_plugin_script *script;
    void *func_argv[5];
-    char empty_arg[1] = { '\0' };
+    char empty_arg[1] = { '\0' }, *result;
    const char *ptr_function, *ptr_data;
    int *rc, ret;

    script = (struct t_plugin_script *)pointer;
    plugin_script_get_function_and_data (data, &ptr_function, &ptr_data);

-    if (ptr_function && ptr_function[0])
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        if (strncmp (command, "func:", 5) == 0)
+        {
+            func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
+
+            result = (char *) weechat_guile_exec (script,
+                                                  WEECHAT_SCRIPT_EXEC_STRING,
+                                                  command + 5,
+                                                  "s", func_argv);
+            if (result)
+            {
+                printf ("%s", result);
+                free (result);
+                return 0;
+            }
+        }
+        return 1;
+    }
+    else if (ptr_function && ptr_function[0])
    {
        func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
        func_argv[1] = (command) ? (char *)command : empty_arg;
@@ -2196,8 +2196,7 @@ irc_server_send_one_msg (struct t_irc_server *server, int flags,
            {
                if (first_message)
                {
-                    irc_raw_print (server, IRC_RAW_FLAG_SEND,
-                                   (msg_encoded) ? msg_encoded : message);
+                    irc_raw_print (server, IRC_RAW_FLAG_SEND, message);
                }
                if (new_msg)
                {
@@ -2085,14 +2085,33 @@ weechat_js_api_hook_process_cb (const void *pointer, void *data,
 {
    struct t_plugin_script *script;
    void *func_argv[5];
-    char empty_arg[1] = { '\0' };
+    char empty_arg[1] = { '\0' }, *result;
    const char *ptr_function, *ptr_data;
    int *rc, ret;

    script = (struct t_plugin_script *)pointer;
    plugin_script_get_function_and_data (data, &ptr_function, &ptr_data);

-    if (ptr_function && ptr_function[0])
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        if (strncmp (command, "func:", 5) == 0)
+        {
+            func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
+
+            result = (char *) weechat_js_exec (script,
+                                               WEECHAT_SCRIPT_EXEC_STRING,
+                                               command + 5,
+                                               "s", func_argv);
+            if (result)
+            {
+                printf ("%s", result);
+                free (result);
+                return 0;
+            }
+        }
+        return 1;
+    }
+    else if (ptr_function && ptr_function[0])
    {
        func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
        func_argv[1] = (command) ? (char *)command : empty_arg;
@@ -215,7 +215,7 @@ weechat_js_exec (struct t_plugin_script *script,
        if ((ret_type == WEECHAT_SCRIPT_EXEC_STRING) && (ret_js->IsString()))
        {
            v8::String::Utf8Value temp_str(ret_js);
-            ret_value = *temp_str;
+            ret_value = (*temp_str) ? strdup(*temp_str) : NULL;
        }
        else if ((ret_type == WEECHAT_SCRIPT_EXEC_INT) && (ret_js->IsInt32()))
        {
@@ -2268,14 +2268,33 @@ weechat_lua_api_hook_process_cb (const void *pointer, void *data,
 {
    struct t_plugin_script *script;
    void *func_argv[5];
-    char empty_arg[1] = { '\0' };
+    char empty_arg[1] = { '\0' }, *result;
    const char *ptr_function, *ptr_data;
    int *rc, ret;

    script = (struct t_plugin_script *)pointer;
    plugin_script_get_function_and_data (data, &ptr_function, &ptr_data);

-    if (ptr_function && ptr_function[0])
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        if (strncmp (command, "func:", 5) == 0)
+        {
+            func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
+
+            result = (char *) weechat_lua_exec (script,
+                                                WEECHAT_SCRIPT_EXEC_STRING,
+                                                command + 5,
+                                                "s", func_argv);
+            if (result)
+            {
+                printf ("%s", result);
+                free (result);
+                return 0;
+            }
+        }
+        return 1;
+    }
+    else if (ptr_function && ptr_function[0])
    {
        func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
        func_argv[1] = (command) ? (char *)command : empty_arg;
@@ -204,7 +204,19 @@ weechat_lua_exec (struct t_plugin_script *script, int ret_type,
    {
        if (ret_type == WEECHAT_SCRIPT_EXEC_STRING)
        {
-            ret_value = strdup ((char *) lua_tostring (lua_current_interpreter, -1));
+            ret_value = (char *) lua_tostring (lua_current_interpreter, -1);
+            if (ret_value)
+            {
+                ret_value = strdup (ret_value);
+            }
+            else
+            {
+                weechat_printf (NULL,
+                                weechat_gettext ("%s%s: function \"%s\" must "
+                                                 "return a valid value"),
+                                weechat_prefix ("error"), LUA_PLUGIN_NAME,
+                                function);
+            }
        }
        else if (ret_type == WEECHAT_SCRIPT_EXEC_INT)
        {
@@ -2198,14 +2198,33 @@ weechat_perl_api_hook_process_cb (const void *pointer, void *data,
 {
    struct t_plugin_script *script;
    void *func_argv[5];
-    char empty_arg[1] = { '\0' };
+    char empty_arg[1] = { '\0' }, *result;
    const char *ptr_function, *ptr_data;
    int *rc, ret;

    script = (struct t_plugin_script *)pointer;
    plugin_script_get_function_and_data (data, &ptr_function, &ptr_data);

-    if (ptr_function && ptr_function[0])
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        if (strncmp (command, "func:", 5) == 0)
+        {
+            func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
+
+            result = (char *) weechat_perl_exec (script,
+                                                 WEECHAT_SCRIPT_EXEC_STRING,
+                                                 command + 5,
+                                                 "s", func_argv);
+            if (result)
+            {
+                printf ("%s", result);
+                free (result);
+                return 0;
+            }
+        }
+        return 1;
+    }
+    else if (ptr_function && ptr_function[0])
    {
        func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
        func_argv[1] = (command) ? (char *)command : empty_arg;
@@ -71,8 +71,11 @@ plugin_script_api_config_new (struct t_weechat_plugin *weechat_plugin,
         script,
         function_and_data);

-    if (!new_config_file && function_and_data)
-        free (function_and_data);
+    if (!new_config_file)
+    {
+        if (function_and_data)
+            free (function_and_data);
+    }

    return new_config_file;
 }
@@ -376,9 +379,6 @@ plugin_script_api_hook_command (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_command (command, description, args,
@@ -418,9 +418,6 @@ plugin_script_api_hook_command_run (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_command_run (command,
@@ -458,9 +455,6 @@ plugin_script_api_hook_timer (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_timer (interval, align_second, max_calls,
@@ -499,9 +493,6 @@ plugin_script_api_hook_fd (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_fd (fd, flag_read, flag_write, flag_exception,
@@ -544,9 +535,6 @@ plugin_script_api_hook_process_hashtable (struct t_weechat_plugin *weechat_plugi
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_process_hashtable (command, options, timeout,
@@ -619,9 +607,6 @@ plugin_script_api_hook_connect (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_connect (proxy, address, port, ipv6, retry,
@@ -669,9 +654,6 @@ plugin_script_api_hook_print (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_print (buffer, tags, message, strip_colors,
@@ -711,9 +693,6 @@ plugin_script_api_hook_signal (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_signal (signal, callback, script,
@@ -752,9 +731,6 @@ plugin_script_api_hook_hsignal (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_hsignal (signal, callback, script,
@@ -793,9 +769,6 @@ plugin_script_api_hook_config (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_config (option, callback, script,
@@ -836,9 +809,6 @@ plugin_script_api_hook_completion (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_completion (completion, description,
@@ -878,9 +848,6 @@ plugin_script_api_hook_modifier (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_modifier (modifier,
@@ -921,9 +888,6 @@ plugin_script_api_hook_info (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_info (info_name, description, args_description,
@@ -965,9 +929,6 @@ plugin_script_api_hook_info_hashtable (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_info_hashtable (info_name, description,
@@ -1013,9 +974,6 @@ plugin_script_api_hook_infolist (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_infolist (infolist_name, description,
@@ -1054,9 +1012,6 @@ plugin_script_api_hook_focus (struct t_weechat_plugin *weechat_plugin,
    char *function_and_data;
    struct t_hook *new_hook;

-    if (!function || !function[0])
-        return NULL;
-
    function_and_data = plugin_script_build_function_and_data (function, data);

    new_hook = weechat_hook_focus (area, callback, script, function_and_data);
@@ -2208,14 +2208,33 @@ weechat_python_api_hook_process_cb (const void *pointer, void *data,
 {
    struct t_plugin_script *script;
    void *func_argv[5];
-    char empty_arg[1] = { '\0' };
+    char empty_arg[1] = { '\0' }, *result;
    const char *ptr_function, *ptr_data;
    int *rc, ret;

    script = (struct t_plugin_script *)pointer;
    plugin_script_get_function_and_data (data, &ptr_function, &ptr_data);

-    if (ptr_function && ptr_function[0])
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        if (strncmp (command, "func:", 5) == 0)
+        {
+            func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
+
+            result = (char *) weechat_python_exec (script,
+                                                   WEECHAT_SCRIPT_EXEC_STRING,
+                                                   command + 5,
+                                                   "s", func_argv);
+            if (result)
+            {
+                printf ("%s", result);
+                free (result);
+                return 0;
+            }
+        }
+        return 1;
+    }
+    else if (ptr_function && ptr_function[0])
    {
        func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
        func_argv[1] = (command) ? (char *)command : empty_arg;
@@ -2682,14 +2682,33 @@ weechat_ruby_api_hook_process_cb (const void *pointer, void *data,
 {
    struct t_plugin_script *script;
    void *func_argv[5];
-    char empty_arg[1] = { '\0' };
+    char empty_arg[1] = { '\0' }, *result;
    const char *ptr_function, *ptr_data;
    int *rc, ret;

    script = (struct t_plugin_script *)pointer;
    plugin_script_get_function_and_data (data, &ptr_function, &ptr_data);

-    if (ptr_function && ptr_function[0])
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        if (strncmp (command, "func:", 5) == 0)
+        {
+            func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
+
+            result = (char *) weechat_ruby_exec (script,
+                                                 WEECHAT_SCRIPT_EXEC_STRING,
+                                                 command + 5,
+                                                 "s", func_argv);
+            if (result)
+            {
+                printf ("%s", result);
+                free (result);
+                return 0;
+            }
+        }
+        return 1;
+    }
+    else if (ptr_function && ptr_function[0])
    {
        func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
        func_argv[1] = (command) ? (char *)command : empty_arg;
@@ -2450,14 +2450,33 @@ weechat_tcl_api_hook_process_cb (const void *pointer, void *data,
 {
    struct t_plugin_script *script;
    void *func_argv[5];
-    char empty_arg[1] = { '\0' };
+    char empty_arg[1] = { '\0' }, *result;
    const char *ptr_function, *ptr_data;
    int *rc, ret;

    script = (struct t_plugin_script *)pointer;
    plugin_script_get_function_and_data (data, &ptr_function, &ptr_data);

-    if (ptr_function && ptr_function[0])
+    if (return_code == WEECHAT_HOOK_PROCESS_CHILD)
+    {
+        if (strncmp (command, "func:", 5) == 0)
+        {
+            func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
+
+            result = (char *) weechat_tcl_exec (script,
+                                                WEECHAT_SCRIPT_EXEC_STRING,
+                                                command + 5,
+                                                "s", func_argv);
+            if (result)
+            {
+                printf ("%s", result);
+                free (result);
+                return 0;
+            }
+        }
+        return 1;
+    }
+    else if (ptr_function && ptr_function[0])
    {
        func_argv[0] = (ptr_data) ? (char *)ptr_data : empty_arg;
        func_argv[1] = (command) ? (char *)command : empty_arg;
@@ -57,7 +57,7 @@ struct timeval;
 * please change the date with current one; for a second change at same
 * date, increment the 01, otherwise please keep 01.
 */
-#define WEECHAT_PLUGIN_API_VERSION "20160324-01"
+#define WEECHAT_PLUGIN_API_VERSION "20160423-01"

 /* macros for defining plugin infos */
 #define WEECHAT_PLUGIN_NAME(__name)                                     \
@@ -138,11 +138,16 @@ struct timeval;

 /*
 * process return code (for callback):
- *   if >= 0, then process ended and it's return code of command
- *   if  < 0, then it's running or error
+ *   if >= 0, the process ended and it's return code of command
+ *   if -1, the process is still running
+ *   if -2, the process ended with an error
+ *   if -3, the callback is called in the child process (exec of function)
+ *          (note: the return code -3 is NEVER sent to script plugins,
+ *           it can be used only in C API)
 */
 #define WEECHAT_HOOK_PROCESS_RUNNING                -1
 #define WEECHAT_HOOK_PROCESS_ERROR                  -2
+#define WEECHAT_HOOK_PROCESS_CHILD                  -3

 /* connect status for connection hooked */
 #define WEECHAT_HOOK_CONNECT_OK                     0
@@ -6,7 +6,7 @@ index ec63514..45a4fb7 100644
 -9
 +8
 diff --git a/debian-devel/control b/debian-devel/control
-index 8fd3e49..a5f9ceb 100644
+index 50f1217..bff1b8f 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
@@ -8,21 +8,20 @@ Build-Depends:
@@ -24,7 +24,8 @@ index 8fd3e49..a5f9ceb 100644
     python-dev,
     libaspell-dev,
     liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
+    tcl8.5-dev,
     guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
@@ -44,7 +45,7 @@ index ec63514..45a4fb7 100644
 -9
 +8
 diff --git a/debian-stable/control b/debian-stable/control
-index 0f3c34b..790b315 100644
+index f9e9aa0..ae1567e 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
@@ -8,21 +8,20 @@ Build-Depends:
@@ -62,7 +63,8 @@ index 0f3c34b..790b315 100644
     python-dev,
     libaspell-dev,
     liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
+    tcl8.5-dev,
     guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
@@ -1,5 +1,5 @@
 diff --git a/debian-devel/control b/debian-devel/control
-index 8fd3e49..38773be 100644
+index 50f1217..24daebc 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
@@ -9,7 +9,6 @@ Build-Depends:
@@ -10,9 +10,12 @@ index 8fd3e49..38773be 100644
     cmake, pkg-config,
     libncursesw5-dev,
     gem2deb,
-@@ -19,10 +18,10 @@ Build-Depends:
+@@ -17,12 +16,12 @@ Build-Depends:
+     python-dev,
+     libaspell-dev,
     liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
+    tcl8.5-dev,
     guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
@@ -25,7 +28,7 @@ index 8fd3e49..38773be 100644
 Standards-Version: 3.9.6
 Homepage: https://weechat.org/
 diff --git a/debian-stable/control b/debian-stable/control
-index 0f3c34b..0d73171 100644
+index f9e9aa0..919202a 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
@@ -9,7 +9,6 @@ Build-Depends:
@@ -36,9 +39,12 @@ index 0f3c34b..0d73171 100644
     cmake, pkg-config,
     libncursesw5-dev,
     gem2deb,
-@@ -19,10 +18,10 @@ Build-Depends:
+@@ -17,12 +16,12 @@ Build-Depends:
+     python-dev,
+     libaspell-dev,
     liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
+    tcl8.5-dev,
     guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
@@ -1 +0,0 @@
-weechat_debian_wheezy.patch
@@ -0,0 +1,70 @@
+diff --git a/debian-devel/control b/debian-devel/control
+index 50f1217..81f0bcb 100644
+--- a/debian-devel/control
+++ b/debian-devel/control
+@@ -9,7 +9,6 @@ Build-Depends:
+     docbook-xsl,
+     docbook-xml,
+     debhelper (>= 9),
+-    dh-exec,
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -19,10 +18,10 @@ Build-Depends:
+     liblua5.1-0-dev,
+     tcl8.6-dev,
+     guile-2.0-dev,
+-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
+    libv8-dev,
+     libcurl4-gnutls-dev,
+-    libgcrypt20-dev,
+-    libgnutls28-dev,
+    libgcrypt11-dev,
+    libgnutls-dev,
+     zlib1g-dev
+ Standards-Version: 3.9.6
+ Homepage: https://weechat.org/
+diff --git a/debian-stable/control b/debian-stable/control
+index f9e9aa0..6841c04 100644
+--- a/debian-stable/control
+++ b/debian-stable/control
+@@ -9,7 +9,6 @@ Build-Depends:
+     docbook-xsl,
+     docbook-xml,
+     debhelper (>= 9),
+-    dh-exec,
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -19,10 +18,10 @@ Build-Depends:
+     liblua5.1-0-dev,
+     tcl8.6-dev,
+     guile-2.0-dev,
+-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
+    libv8-dev,
+     libcurl4-gnutls-dev,
+-    libgcrypt20-dev,
+-    libgnutls28-dev,
+    libgcrypt11-dev,
+    libgnutls-dev,
+     zlib1g-dev
+ Standards-Version: 3.9.6
+ Homepage: https://weechat.org/
+diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install
+old mode 100755
+new mode 100644
+index 198360f..980192f
+--- a/debian-stable/weechat-plugins.install
+++ b/debian-stable/weechat-plugins.install
+@@ -1,10 +1,8 @@
+-#!/usr/bin/dh-exec
+-
+ usr/lib/weechat/plugins/aspell.so
+ usr/lib/weechat/plugins/exec.so
+ usr/lib/weechat/plugins/fifo.so
+ usr/lib/weechat/plugins/guile.so
+-[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so
+usr/lib/weechat/plugins/javascript.so
+ usr/lib/weechat/plugins/lua.so
+ usr/lib/weechat/plugins/perl.so
+ usr/lib/weechat/plugins/python.so
@@ -32,9 +32,9 @@
 #     devel-patch  the patch version of devel (e.g. 2 for version 1.4.2)
 #

-WEECHAT_STABLE=1.4
+WEECHAT_STABLE=1.5
 WEECHAT_DEVEL=1.5
-WEECHAT_DEVEL_FULL=1.5-rc1
+WEECHAT_DEVEL_FULL=1.5

 if [ $# -lt 1 ]; then
    echo >&2 "Syntax: $0 stable|devel|devel-full|devel-major|devel-minor|devel-patch"
@@ -23,7 +23,7 @@
 #

 %define name weechat
-%define version 1.4
+%define version 1.5
 %define release 1

 Name:      %{name}
@@ -77,6 +77,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/share/icons/hicolor/32x32/apps/weechat.png

 %changelog
+* Sun May 01 2016 Sébastien Helleu <flashcode@flashtux.org> 1.5-1
+- Released version 1.5
 * Sun Jan 10 2016 Sébastien Helleu <flashcode@flashtux.org> 1.4-1
 - Released version 1.4
 * Sun Aug 16 2015 Sébastien Helleu <flashcode@flashtux.org> 1.3-1
Author	SHA1	Message	Date
Sébastien Helleu	c017af8e0a	Version 1.5	2016-05-01 12:50:12 +02:00
Sébastien Helleu	e8e36ad32f	core: add detection of Tcl 8.6 in autotools	2016-05-01 11:36:18 +02:00
Sébastien Helleu	e47e10b8fe	debian: update changelog and copyright	2016-05-01 09:26:37 +02:00
Sébastien Helleu	816ddb0018	debian: build Tcl plugin against Tcl 8.6	2016-05-01 09:16:18 +02:00
Sébastien Helleu	1acadf4108	debian: fix Vcs-(Git\|Browser) fields to use secure URIs	2016-05-01 08:58:19 +02:00
Sébastien Helleu	881f258d3e	doc: update auto-generated files with URL options	2016-05-01 08:46:46 +02:00
Sébastien Helleu	f4da7bfdee	core: move lines from features to bugs in ChangeLog	2016-04-30 20:14:01 +02:00
Sébastien Helleu	f428779762	core: remove quotes in ChangeLog	2016-04-30 20:01:47 +02:00
Sébastien Helleu	fb4f154c2f	core: add Curl options for versions 7.38.1 to 7.49.0	2016-04-30 12:32:15 +02:00
Sébastien Helleu	eff655ab23	script: make callbacks optional again in hook functions (issue #406 )	2016-04-28 19:51:12 +02:00
Sébastien Helleu	b0aa0d3602	doc: fix typo in plugin API reference	2016-04-28 07:32:01 +02:00
Sébastien Helleu	e65d17eaf6	doc: update Polish auto-generated files	2016-04-27 19:59:08 +02:00
Krzysztof Korościk	171cb6995a	po: update polish translation	2016-04-27 19:03:58 +02:00
Krzysztof Korościk	7233fa7dc4	doc: update polish translation	2016-04-27 18:50:02 +02:00
Sébastien Helleu	5c8f540c47	Merge pull request #720 from l/translation_ja doc: update Japanese translations	2016-04-26 19:00:59 +02:00
AYANOKOUZI, Ryuunosuke	e03a97528b	doc: update Japanese translations	2016-04-26 09:00:00 +09:00
Sébastien Helleu	c1441b111f	irc: fix first message displayed in raw buffer when the message is modified by a modifier (closes #719 )	2016-04-24 10:10:12 +02:00
Sébastien Helleu	7e988871ab	Version 1.5-rc2	2016-04-23 14:48:58 +02:00
Sébastien Helleu	8a1650b26f	lua: fix crash when a lua function doesn't return a value and a string was expected (closes #718 )	2016-04-23 14:33:04 +02:00
Sébastien Helleu	51c3e0b9ec	api: add support of functions in hook_process	2016-04-23 13:59:20 +02:00
Sébastien Helleu	ae89d28462	javascript: fix string value returned by js functions	2016-04-23 13:58:46 +02:00
Sébastien Helleu	54151a3480	core: update email of Krzysztof Korościk	2016-04-20 19:39:43 +02:00
Sébastien Helleu	66ec959001	core: update ChangeLog	2016-04-19 21:07:44 +02:00
Sébastien Helleu	c7bd1bca8b	core: fix case of external software names in ChangeLog	2016-04-18 21:17:56 +02:00
Sébastien Helleu	ca80d4fae7	doc: convert a note into asciidoc "[NOTE]" in tester's guide	2016-04-17 14:34:03 +02:00
Sébastien Helleu	8c78abe2c0	core: add Portuguese language in configure script	2016-04-16 11:39:01 +02:00
Sébastien Helleu	729bdbf5e3	core: add contributor in AUTHORS.asciidoc	2016-04-16 11:38:18 +02:00
Sébastien Helleu	6b2e9847a9	core: fix whitespace in Portuguese translations	2016-04-16 10:35:18 +02:00
Sébastien Helleu	4e74ad3107	Merge remote-tracking branch 'origin/pr/716'	2016-04-16 10:23:21 +02:00
Nils Görs	80621129f7	doc: update German documentation	2016-04-16 09:32:50 +02:00
Vasco Almeida	4806d7f20f	core: add Portuguese translation	2016-04-15 11:44:29 +00:00
Sébastien Helleu	89084850a5	Merge pull request #715 from l/translation_ja doc: update Japanese translations	2016-04-15 07:25:58 +02:00
AYANOKOUZI, Ryuunosuke	06e2a1bb25	doc: update Japanese translations	2016-04-15 09:00:00 +09:00
Sébastien Helleu	906c6ebb61	doc: mask SASL mechanisms dh-blowfish and dh-aes as "insecure"	2016-04-14 07:30:49 +02:00