Version 4.0.7

This is not strictly necessary, just in case the function strtol() doesn't
update the pointer.

.github/workflows/ci.yml

@@ -33,6 +33,8 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPENDENCIES }}
+        # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
+        sudo apt-get --yes purge php8.1-imagick
         sudo -H pip3 install --ignore-installed msgcheck
 
     - name: Check gettext files

CMakeLists.txt

@@ -200,20 +200,6 @@ if(ENABLE_LARGEFILE)
   add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES)
 endif()
 
-# Check for Gettext
-if(ENABLE_NLS)
-  find_package(Gettext)
-  if(GETTEXT_FOUND)
-    add_definitions(-DENABLE_NLS)
-    find_package(Intl)
-    if(Intl_FOUND)
-      list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
-    endif()
-  else()
-    message(SEND_ERROR "Gettext not found")
-  endif()
-endif()
-
 # Check for libgcrypt
 find_package(GCRYPT REQUIRED)
 add_definitions(-DHAVE_GCRYPT)
@@ -258,7 +244,13 @@ endif()
 add_subdirectory(icons)
 
 if(ENABLE_NLS)
+  find_package(Gettext REQUIRED)
+  add_definitions(-DENABLE_NLS)
+  find_package(Intl REQUIRED)
+  list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
   add_subdirectory(po)
+else()
+  add_custom_target(translations COMMAND true)
 endif()
 
 add_subdirectory(src)

ChangeLog.adoc

@@ -10,6 +10,129 @@ This document lists all the changes for each version. +
 For a list of important changes that require manual actions, please look at release notes.
 
 
+[[v4.0.7]]
+== Version 4.0.7 (2023-12-03)
+
+Bug fixes::
+
+  * core: fix value of buffer variable "num_history" when the value defined in option weechat.history.max_commands is reached
+  * core: remove incorrect warning when binding keys kbd:[F10] to kbd:[F20] (issue #2039)
+  * core: fix memory leak when config version is invalid or not supported
+  * core: fix crash when "config_version" is present in a configuration file without a value
+  * core: display an error on startup if environment variable "HOME" is not set
+  * irc: remove trailing "\r\n" in signals "irc_out" and "irc_outtags" when messages are queued
+  * irc: fix target buffer of IRC message 337 (whois reply: "is hiding their idle time")
+  * relay: close properly connection with the IRC client in case of server disconnection (issue #2038)
+  * ruby: fix use of NULL variable when displaying exception
+
+[[v4.0.6]]
+== Version 4.0.6 (2023-10-26)
+
+Bug fixes::
+
+  * core: fix crash when a custom bar item name is already used by a default bar item (issue #2034)
+  * core: fix generation of TOTP on Big Endian systems (issue #2021)
+  * irc: move value `-all` at the end of completions for command `/ignore del`
+  * irc: fix memory leak when joining channels with keys
+
+Build::
+
+  * core: fix build error if CMake option ENABLE_NLS is turned to off or if required dependencies are not found (issue #2026, issue #2031)
+
+[[v4.0.5]]
+== Version 4.0.5 (2023-09-24)
+
+New features::
+
+  * core: automatically backup config file read if it has an unsupported version (issue #2013)
+  * core: display a message when a configuration file is updated to a newer version
+  * python: make stub (weechat.pyi) compatible with Python 3.8 and 3.9 (issue #2006)
+
+Bug fixes::
+
+  * irc: add option irc.look.open_pv_buffer_echo_msg to open private buffer on self message when capability echo-message is enabled (issue #2016)
+  * irc: fix title of private buffers wrongly set to own address when capability echo-message is enabled (issue #2016)
+  * irc: fix autojoin of channels when private buffers are opened (issue #2012)
+  * irc: fix string comparison when CASEMAPPING is set to "ascii"
+  * script: fix removal of script in system directory while trying to install a script (issue #2019)
+  * script: fix autoload of multiple scripts at once with `/script autoload` (issue #2018)
+  * script: fix crash when a `/script` command triggers another `/script` command (issue #923)
+  * xfer: fix memory leak on plugin unload
+
+Tests::
+
+  * irc: add tests on server functions
+
+[[v4.0.4]]
+== Version 4.0.4 (2023-08-22)
+
+Bug fixes::
+
+  * core: fix integer overflow when setting integer option with `++N` or `--N`
+  * core: fix increment/decrement of options weechat.notify.*
+  * irc: add missing tags on multiline messages (issue #1987)
+  * irc: fix redirection of command `/list` when the reply doesn't start with message 321 (start of /list)
+  * irc: fix wrong time displayed for CTCP messages received from self nick (issue #2000)
+  * logger: remove trailing empty line in display of backlog (issue #2002)
+  * perl: fix display of non-ASCII chars after load of a script with Perl >= 5.38 (issue #1996)
+  * script: adjust scroll after command `/script go N`
+  * scripts: fix function string_parse_size on 32-bit systems (python and ruby) (issue #1999)
+  * xfer: fix conversion of string to IPv4 on 32-bit systems (issue #1999)
+
+Tests::
+
+  * irc: fix tests on function irc_join_compare_join_channel (issue #1997)
+  * scripts: fix tests of functions print_date_tag, print_y_date_tags and hook_timer on 32-bit systems (issue #1999)
+
+[[v4.0.3]]
+== Version 4.0.3 (2023-08-08)
+
+Bug fixes::
+
+  * core: fix input length and crash after delete of line (issue #1989)
+  * irc: fix display of self CTCP message containing bold attribute (issue #1981)
+  * irc: fix memory leak in IRC message parser
+  * irc: fix switch to channel manually joined when server option autojoin_dynamic is on and option irc.look.buffer_switch_autojoin is off (issue #1982)
+  * irc: fix display of outgoing notice with channel when capability "echo-message" is enabled (issue #1991)
+  * relay: fix display of IRC CTCP messages received from client (issue #1986)
+
+Build::
+
+  * doc: display a warning if a locale is missing with fallback to English for auto-generated content (issue #1985)
+
+[[v4.0.2]]
+== Version 4.0.2 (2023-07-12)
+
+Bug fixes::
+
+  * core: fix renaming of options with command `/item rename` (issue #1978)
+  * core: don't send "key_pressed" signal again for the same key press (issue #1976)
+  * core: don't send "key_combo_*" signals for incomplete keys (issue #1976)
+  * core: add key kbd:[Ctrl+Backspace] in /help key (issue #1975)
+  * core: keep keys `ctrl-H` and `ctrl-?` (in lower case) if they were manually bound to custom commands in a previous version
+
+Tests::
+
+  * core: fix hdata tests failure on Alpine 3.18
+  * relay: fix crash in tests on Alpine 3.18
+
+Build::
+
+  * php: fix detection of PHP 8.2 on Alpine 3.18
+
+[[v4.0.1]]
+== Version 4.0.1 (2023-06-30)
+
+Bug fixes::
+
+  * core: force key "return" to command "/input return" when migrating legacy keys
+  * core: display actual key name and command with key kbd:[Alt+k], remove key kbd:[Alt+K] (grab raw key) and associated commands `/input grab_raw_key` and `/input grab_raw_key_command`
+  * core: check for newline characters in string_is_whitespace_char (issue #1968)
+  * api: do not convert option name to lower case in API functions config_set_plugin and config_set_desc_plugin
+  * guile: fix crash on quit with Guile < 3 (issue #1965)
+  * irc: reply to a CTCP request sent to self nick (issue #1966)
+  * irc: sent "QUIT" message to servers connected with TLS on `/upgrade`
+
 [[v4.0.0]]
 == Version 4.0.0 (2023-06-24)
 
@@ -24,7 +147,7 @@ New features::
   * core: insert multiple pasted lines in input instead of sending immediately, add keys to move and delete in a single line and whole input, add option weechat.look.input_multiline_lead_linebreak (issue #1502, issue #1503, issue #1504)
   * core: render newline characters in chat line messages (issue #1908)
   * core: don't split on newline characters in printf_date_tags when input_multiline is set (issue #1909)
-  * core: add key @kbd:[l] in cursor mode to quote line, add variable "_chat_focused_line" in function hashtable sent to hook_focus callback (issue #1913, issue #1914)
+  * core: add key kbd:[l] (lower `L`) in cursor mode to quote line, add variable "_chat_focused_line" in function hashtable sent to hook_focus callback (issue #1913, issue #1914)
   * core: add option `split_return` in command `/input` (issue #1916)
   * core: send all command line parameters not beginning with a dash to all plugins
   * core: add command `/reset` to reset options to their default values
@@ -33,6 +156,7 @@ New features::
   * core: add access to hashtable properties in evaluation of expressions (issue #1888)
   * core: display similar command names when a command is unknown (issue #1877)
   * core: rename option weechat.color.status_name_ssl to weechat.color.status_name_tls
+  * core: add option weechat.color.status_name_insecure to display buffer name with a specific color when not connected with TLS to the server
   * core, plugins: make many identifiers case sensitive (issue #1872, issue #398, bug #32213)
   * core: add item "mouse_status" in default status bar, change default color to lightgreen
   * core, trigger: add options weechat.color.chat_status_disabled and weechat.color.chat_status_enabled, remove options trigger.color.trigger and trigger.color.trigger_disabled, add enabled/disabled status color in output of `/filter list` (issue #1820)
@@ -1637,7 +1761,7 @@ New features::
   * core: add option weechat.look.hotlist_add_conditions, remove option weechat.look.hotlist_add_buffer_if_away
   * core: add option weechat.look.hotlist_remove (issue #99)
   * core: add options `-beep` and `-current` in command `/print`
-  * core: add bare display mode for easy text selection and click on URLs, new key: kbd:[Alt+l] (`L`), new option "bare" in command `/window`, new options: weechat.look.bare_display_exit_on_input and weechat.look.bare_display_time_format
+  * core: add bare display mode for easy text selection and click on URLs, new key: kbd:[Alt+l] (lower `L`), new option "bare" in command `/window`, new options: weechat.look.bare_display_exit_on_input and weechat.look.bare_display_time_format
   * core: add signals "key_combo_{default|search|cursor}"
   * core: add terabyte unit for size displayed
   * core: display a warning in case of inconsistency between the options weechat.look.save_{config|layout}_on_exit

ReleaseNotes.adoc

@@ -11,6 +11,64 @@ It is recommended to read it when upgrading to a new stable version. +
 For a complete list of changes, please look at ChangeLog.
 
 
+[[v4.0.7]]
+== Version 4.0.7 (2023-12-03)
+
+No release notes.
+
+[[v4.0.6]]
+== Version 4.0.6 (2023-10-26)
+
+[[v4.0.6_custom_bar_items]]
+=== Custom bar items
+
+Custom bar items must now have a different name than default bar items
+(for example the custom bar item name `time` is now forbidden).
+
+If you have such names in your config, WeeChat will now fail to load them
+(this should not happen anyway, since such bar items can not be properly used
+and can cause a crash of WeeChat).
+
+[[v4.0.5]]
+== Version 4.0.5 (2023-09-24)
+
+No release notes.
+
+[[v4.0.4]]
+== Version 4.0.4 (2023-08-22)
+
+No release notes.
+
+[[v4.0.3]]
+== Version 4.0.3 (2023-08-08)
+
+No release notes.
+
+[[v4.0.2]]
+== Version 4.0.2 (2023-07-12)
+
+No release notes.
+
+[[v4.0.1]]
+== Version 4.0.1 (2023-06-30)
+
+[[v4.0.1_config_set_plugin]]
+=== Functions config_set_plugin and config_set_desc_plugin
+
+The functions link:https://weechat.org/doc/weechat/plugin/#_config_set_plugin[config_set_plugin]
+and link:https://weechat.org/doc/weechat/plugin/#_config_set_desc_plugin[config_set_desc_plugin]
+are not converting any more the option name to lower case because since version 4.0.0,
+the name of options is case sensitive.
+
+[[v4.0.1_grab_raw_key]]
+=== Grab raw key and command
+
+Key kbd:[Alt+K] (upper case) has been removed, as well as commands
+`/input grab_raw_key` and `/input grab_raw_key_command`.
+
+Now the key kbd:[Alt+k] displays the actual key name and command, possibly
+raw key.
+
 [[v4.0.0]]
 == Version 4.0.0 (2023-06-24)
 
@@ -182,6 +240,10 @@ Alias converted to lower case: "CLOSE" => "close"
 [[v4.0.0_tls]]
 === TLS options and connections
 
+Option `weechat.color.status_name_insecure` has been added, the buffer name
+is now displayed with color `lightmagenta` by default if the connection with
+the server is *NOT* made with TLS.
+
 Options, commands and documentation have been updated to "TLS" instead of "SSL":
 
 * core option:
@@ -449,7 +511,7 @@ now any return value is ignored (like it has always been in the C API).
 [[v3.7.1]]
 == Version 3.7.1 (2022-10-21)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v3.7]]
 == Version 3.7 (2022-10-09)
@@ -571,7 +633,7 @@ and is now a percentage between `0` and `100`:
 [[v3.4.1]]
 == Version 3.4.1 (2022-03-13)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v3.4]]
 == Version 3.4 (2021-12-18)
@@ -729,7 +791,7 @@ For example:
 [[v3.2.1]]
 == Version 3.2.1 (2021-09-04)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v3.2]]
 == Version 3.2 (2021-06-13)
@@ -959,7 +1021,7 @@ must adjust the value of the new option, which defaults to 1:
 [[v3.0.1]]
 == Version 3.0.1 (2021-01-31)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v3.0]]
 == Version 3.0 (2020-11-11)
@@ -1267,7 +1329,7 @@ version:
 [[v2.7.1]]
 == Version 2.7.1 (2020-02-20)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v2.7]]
 == Version 2.7 (2019-12-08)
@@ -1511,7 +1573,7 @@ Functions removed from C API:
 [[v2.3]]
 == Version 2.3 (2018-10-21)
 
-No release note.
+No release notes.
 
 [[v2.2]]
 == Version 2.2 (2018-07-14)
@@ -1647,7 +1709,7 @@ List of options moved:
 [[v2.0.1]]
 == Version 2.0.1 (2017-12-20)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v2.0]]
 == Version 2.0 (2017-12-03)
@@ -1742,12 +1804,12 @@ to integer before using it, for example in Python: `int(fd)`.
 [[v1.9.1]]
 == Version 1.9.1 (2017-09-23)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v1.9]]
 == Version 1.9 (2017-06-25)
 
-No release note.
+No release notes.
 
 [[v1.8]]
 == Version 1.8 (2017-05-13)
@@ -1799,7 +1861,7 @@ Aspell option with color for suggestion on a misspelled word has been renamed:
 [[v1.7.1]]
 == Version 1.7.1 (2017-04-22)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v1.7]]
 == Version 1.7 (2017-01-15)
@@ -2046,7 +2108,7 @@ command:
 [[v1.1.1]]
 == Version 1.1.1 (2015-01-25)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v1.1]]
 == Version 1.1 (2015-01-11)
@@ -2166,7 +2228,7 @@ instead of milliseconds:
 [[v1.0.1]]
 == Version 1.0.1 (2014-09-28)
 
-Bug fix and maintenance release.
+No release notes.
 
 [[v1.0]]
 == Version 1.0 (2014-08-15)
@@ -2992,17 +3054,17 @@ This version fixes a major bug: crash with some special chars in IRC messages.
 [[v0.2.6]]
 == Version 0.2.6 (2007-09-06)
 
-No release note.
+No release notes.
 
 [[v0.2.5]]
 == Version 0.2.5 (2007-06-07)
 
-No release note.
+No release notes.
 
 [[v0.2.4]]
 == Version 0.2.4 (2007-03-29)
 
-No release note.
+No release notes.
 
 [[v0.2.3]]
 == Version 0.2.3 (2007-01-10)
@@ -3061,7 +3123,7 @@ Which gives something like:
 [[v0.2.1]]
 == Version 0.2.1 (2006-10-01)
 
-No release note.
+No release notes.
 
 [[v0.2.0]]
 == Version 0.2.0 (2006-08-19)
@@ -3175,74 +3237,74 @@ at startup.
 [[v0.1.5]]
 == Version 0.1.5 (2005-09-24)
 
-No release note.
+No release notes.
 
 [[v0.1.4]]
 == Version 0.1.4 (2005-07-30)
 
-No release note.
+No release notes.
 
 [[v0.1.3]]
 == Version 0.1.3 (2005-07-02)
 
-No release note.
+No release notes.
 
 [[v0.1.2]]
 == Version 0.1.2 (2005-05-21)
 
-No release note.
+No release notes.
 
 [[v0.1.1]]
 == Version 0.1.1 (2005-03-20)
 
-No release note.
+No release notes.
 
 [[v0.1.0]]
 == Version 0.1.0 (2005-02-12)
 
-No release note.
+No release notes.
 
 [[v0.0.9]]
 == Version 0.0.9 (2005-01-01)
 
-No release note.
+No release notes.
 
 [[v0.0.8]]
 == Version 0.0.8 (2004-10-30)
 
-No release note.
+No release notes.
 
 [[v0.0.7]]
 == Version 0.0.7 (2004-08-08)
 
-No release note.
+No release notes.
 
 [[v0.0.6]]
 == Version 0.0.6 (2004-06-05)
 
-No release note.
+No release notes.
 
 [[v0.0.5]]
 == Version 0.0.5 (2004-02-07)
 
-No release note.
+No release notes.
 
 [[v0.0.4]]
 == Version 0.0.4 (2004-01-01)
 
-No release note.
+No release notes.
 
 [[v0.0.3]]
 == Version 0.0.3 (2003-11-03)
 
-No release note.
+No release notes.
 
 [[v0.0.2]]
 == Version 0.0.2 (2003-10-05)
 
-No release note.
+No release notes.
 
 [[v0.0.1]]
 == Version 0.0.1 (2003-09-27)
 
-No release note.
+No release notes.

cmake/FindGettext.cmake

@@ -45,26 +45,28 @@ set(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
 
 check_include_files(libintl.h HAVE_LIBINTL_H)
 
-if(HAVE_LIBINTL_H)
-  check_function_exists(dgettext LIBC_HAS_DGETTEXT)
-  if(LIBC_HAS_DGETTEXT)
-    set(GETTEXT_FOUND TRUE)
-  else()
-    find_library(LIBINTL_LIBRARY NAMES intl
-      PATHS
-      /usr/local/lib
-      /usr/lib
-    )
-    if(LIBINTL_LIBRARY)
-      if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-        set(CMAKE_REQUIRED_LIBRARIES "iconv")
-        check_library_exists(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
-      else()
-        check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-      endif()
-      if(LIBINTL_HAS_DGETTEXT)
-        set(GETTEXT_FOUND TRUE)
-      endif()
+if(NOT HAVE_LIBINTL_H)
+  message(SEND_ERROR "Header libintl.h not found, required if ENABLE_NLS is enabled")
+endif()
+
+check_function_exists(dgettext LIBC_HAS_DGETTEXT)
+if(LIBC_HAS_DGETTEXT)
+  set(GETTEXT_FOUND TRUE)
+else()
+  find_library(LIBINTL_LIBRARY NAMES intl
+    PATHS
+    /usr/local/lib
+    /usr/lib
+  )
+  if(LIBINTL_LIBRARY)
+    if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+      set(CMAKE_REQUIRED_LIBRARIES "iconv")
+      check_library_exists(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
+    else()
+      check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+    endif()
+    if(LIBINTL_HAS_DGETTEXT)
+      set(GETTEXT_FOUND TRUE)
     endif()
   endif()
 endif()

cmake/FindPHP.cmake

@@ -48,7 +48,7 @@ if(NOT PHP_FOUND)
     execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(${PHP_VERSION} MATCHES "^[78]")
       find_library(PHP_LIB
-        NAMES php8.2 php8.1 php8.0 php8 php7.4 php7.3 php7.2 php7.1 php7.0 php7 php
+        NAMES php8.2 php82 php8.1 php81 php8.0 php80 php8 php7.4 php74 php7.3 php73 php7.2 php72 php7.1 php71 php7.0 php70 php7 php
         HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
       )
       if(PHP_LIB)

config.h.cmake

@@ -1,4 +1,3 @@
-#cmakedefine HAVE_LIBINTL_H
 #cmakedefine HAVE_SYS_RESOURCE_H
 #cmakedefine HAVE_FLOCK
 #cmakedefine HAVE_LANGINFO_CODESET

doc/en/weechat_plugin_api.en.adoc

@@ -6796,7 +6796,7 @@ def config_new_section(config_file: str, name: str,
                        callback_delete_option: str, callback_delete_option_data: str) -> str: ...
 
 # example
-def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -6815,7 +6815,7 @@ def my_section_write_default_cb(data: str, config_file: str, section_name: str)
     # return weechat.WEECHAT_CONFIG_WRITE_ERROR
     # return weechat.WEECHAT_CONFIG_WRITE_MEMORY_ERROR
 
-def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -7056,7 +7056,7 @@ Script (Python):
 # prototype
 def config_new_option(config_file: str, section: str, name: str, type: str, description: str,
                       string_values: str, min: int, max: int,
-                      default_value: str | None, value: str | None, null_value_allowed: int,
+                      default_value: Union[str, None], value: Union[str, None], null_value_allowed: int,
                       callback_check_value: str, callback_check_value_data: str,
                       callback_change: str, callback_change_data: str,
                       callback_delete: str, callback_delete_data: str) -> str: ...

doc/fr/weechat_plugin_api.fr.adoc

@@ -6819,9 +6819,10 @@ my_section_read_cb (const void *pointer, void *data,
 {
     /* ... */
 
-    return WEECHAT_CONFIG_READ_OK;
-    /* return WEECHAT_CONFIG_READ_MEMORY_ERROR; */
-    /* return WEECHAT_CONFIG_READ_FILE_NOT_FOUND; */
+    return WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
+    /* return WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE; */
+    /* return WEECHAT_CONFIG_OPTION_SET_ERROR; */
+    /* return WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND; */
 }
 
 int
@@ -6911,7 +6912,7 @@ def config_new_section(config_file: str, name: str,
                        callback_delete_option: str, callback_delete_option_data: str) -> str: ...
 
 # exemple
-def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -6930,7 +6931,7 @@ def my_section_write_default_cb(data: str, config_file: str, section_name: str)
     # return weechat.WEECHAT_CONFIG_WRITE_ERROR
     # return weechat.WEECHAT_CONFIG_WRITE_MEMORY_ERROR
 
-def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -7176,7 +7177,7 @@ Script (Python) :
 # prototype
 def config_new_option(config_file: str, section: str, name: str, type: str, description: str,
                       string_values: str, min: int, max: int,
-                      default_value: str | None, value: str | None, null_value_allowed: int,
+                      default_value: Union[str, None], value: Union[str, None], null_value_allowed: int,
                       callback_check_value: str, callback_check_value_data: str,
                       callback_change: str, callback_change_data: str,
                       callback_delete: str, callback_delete_data: str) -> str: ...

doc/it/weechat_plugin_api.it.adoc

@@ -6980,9 +6980,10 @@ my_section_read_cb (const void *pointer, void *data,
 {
     /* ... */
 
-    return WEECHAT_CONFIG_READ_OK;
-    /* return WEECHAT_CONFIG_READ_MEMORY_ERROR; */
-    /* return WEECHAT_CONFIG_READ_FILE_NOT_FOUND; */
+    return WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
+    /* return WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE; */
+    /* return WEECHAT_CONFIG_OPTION_SET_ERROR; */
+    /* return WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND; */
 }
 
 int
@@ -7072,7 +7073,7 @@ def config_new_section(config_file: str, name: str,
                        callback_delete_option: str, callback_delete_option_data: str) -> str: ...
 
 # esempio
-def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -7091,7 +7092,7 @@ def my_section_write_default_cb(data: str, config_file: str, section_name: str)
     # return weechat.WEECHAT_CONFIG_WRITE_ERROR
     # return weechat.WEECHAT_CONFIG_WRITE_MEMORY_ERROR
 
-def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -7337,7 +7338,7 @@ Script (Python):
 # prototipo
 def config_new_option(config_file: str, section: str, name: str, type: str, description: str,
                       string_values: str, min: int, max: int,
-                      default_value: str | None, value: str | None, null_value_allowed: int,
+                      default_value: Union[str, None], value: Union[str, None], null_value_allowed: int,
                       callback_check_value: str, callback_check_value_data: str,
                       callback_change: str, callback_change_data: str,
                       callback_delete: str, callback_delete_data: str) -> str: ...

doc/ja/weechat_plugin_api.ja.adoc

@@ -6784,9 +6784,10 @@ my_section_read_cb (const void *pointer, void *data,
 {
     /* ... */
 
-    return WEECHAT_CONFIG_READ_OK;
-    /* return WEECHAT_CONFIG_READ_MEMORY_ERROR; */
-    /* return WEECHAT_CONFIG_READ_FILE_NOT_FOUND; */
+    return WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
+    /* return WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE; */
+    /* return WEECHAT_CONFIG_OPTION_SET_ERROR; */
+    /* return WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND; */
 }
 
 int
@@ -6876,7 +6877,7 @@ def config_new_section(config_file: str, name: str,
                        callback_delete_option: str, callback_delete_option_data: str) -> str: ...
 
 # 例
-def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -6895,7 +6896,7 @@ def my_section_write_default_cb(data: str, config_file: str, section_name: str)
     # return weechat.WEECHAT_CONFIG_WRITE_ERROR
     # return weechat.WEECHAT_CONFIG_WRITE_MEMORY_ERROR
 
-def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -7136,7 +7137,7 @@ struct t_config_option *option5 =
 # プロトタイプ
 def config_new_option(config_file: str, section: str, name: str, type: str, description: str,
                       string_values: str, min: int, max: int,
-                      default_value: str | None, value: str | None, null_value_allowed: int,
+                      default_value: Union[str, None], value: Union[str, None], null_value_allowed: int,
                       callback_check_value: str, callback_check_value_data: str,
                       callback_change: str, callback_change_data: str,
                       callback_delete: str, callback_delete_data: str) -> str: ...

doc/python_stub.py

@@ -37,7 +37,7 @@ STUB_HEADER = """\
 # DO NOT EDIT BY HAND!
 #
 
-from typing import Dict
+from typing import Dict, Union
 """
 
 CONSTANT_RE = (

doc/sr/weechat_plugin_api.sr.adoc

@@ -6509,9 +6509,10 @@ my_section_read_cb (const void *pointer, void *data,
 {
     /* ... */
 
-    return WEECHAT_CONFIG_READ_OK;
-    /* return WEECHAT_CONFIG_READ_MEMORY_ERROR; */
-    /* return WEECHAT_CONFIG_READ_FILE_NOT_FOUND; */
+    return WEECHAT_CONFIG_OPTION_SET_OK_CHANGED;
+    /* return WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE; */
+    /* return WEECHAT_CONFIG_OPTION_SET_ERROR; */
+    /* return WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND; */
 }
 
 int
@@ -6601,7 +6602,7 @@ def config_new_section(config_file: str, name: str,
                        callback_delete_option: str, callback_delete_option_data: str) -> str: ...
 
 # пример
-def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -6620,7 +6621,7 @@ def my_section_write_default_cb(data: str, config_file: str, section_name: str)
     # return weechat.WEECHAT_CONFIG_WRITE_ERROR
     # return weechat.WEECHAT_CONFIG_WRITE_MEMORY_ERROR
 
-def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
     # ...
     return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
     # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -6844,7 +6845,7 @@ struct t_config_option *option5 =
 # прототип
 def config_new_option(config_file: str, section: str, name: str, type: str, description: str,
                       string_values: str, min: int, max: int,
-                      default_value: str | None, value: str | None, null_value_allowed: int,
+                      default_value: Union[str, None], value: Union[str, None], null_value_allowed: int,
                       callback_check_value: str, callback_check_value_data: str,
                       callback_change: str, callback_change_data: str,
                       callback_delete: str, callback_delete_data: str) -> str: ...

po/CMakeLists.txt

@@ -17,6 +17,11 @@
 # along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+# Check for programs xgettext, msgmerge and msgfmt
+find_program(XGETTEXT_EXECUTABLE xgettext REQUIRED)
+find_program(MSGMERGE_EXECUTABLE msgmerge REQUIRED)
+find_program(MSGFMT_EXECUTABLE msgfmt REQUIRED)
+
 set(PO_FILES
   cs.po
   de.po
@@ -39,70 +44,61 @@ set(POT_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${POT_FILE}")
 
 include(srcfiles.cmake)
 
-# Looking for xgettext, msgmerge and msgfmt
-find_program(XGETTEXT_EXECUTABLE xgettext)
-find_program(MSGMERGE_EXECUTABLE msgmerge)
-find_program(MSGFMT_EXECUTABLE msgfmt)
+# Create PO template file weechat.pot
+set(SRC_FILES)
+set(POT_DEPENDS)
 
-if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXECUTABLE AND MSGFMT_EXECUTABLE)
+foreach(srcfile ${WEECHAT_SOURCES})
+  set(SRC_FILES ${SRC_FILES} ${srcfile})
+  set(POT_DEPENDS ${POT_DEPENDS} "${CMAKE_SOURCE_DIR}/${srcfile}")
+endforeach()
 
-  # Create PO template file weechat.pot
-  set(SRC_FILES)
-  set(POT_DEPENDS)
+add_custom_command(
+  OUTPUT "${POT_FILE_PATH}"
+  COMMAND "${XGETTEXT_EXECUTABLE}"
+  ARGS -o "${POT_FILE_PATH}" --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory="${CMAKE_SOURCE_DIR}" --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
+  DEPENDS ${POT_DEPENDS}
+  COMMENT "Generating ${POT_FILE}"
+)
 
-  foreach(srcfile ${WEECHAT_SOURCES})
-    set(SRC_FILES ${SRC_FILES} ${srcfile})
-    set(POT_DEPENDS ${POT_DEPENDS} "${CMAKE_SOURCE_DIR}/${srcfile}")
-  endforeach()
+set(MO_FILES)
+set(UPDATE_PO_TARGETS)
+foreach(pofile ${PO_FILES})
+  get_filename_component(polang ${pofile} NAME_WE)
 
+  # Compile .po files in build directory (to binary .mo files)
+  set(modir "${CMAKE_CURRENT_BINARY_DIR}/${polang}/LC_MESSAGES")
+  file(MAKE_DIRECTORY "${modir}")
+  set(mofile "${modir}/${PROJECT_NAME}.mo")
   add_custom_command(
-    OUTPUT "${POT_FILE_PATH}"
-    COMMAND "${XGETTEXT_EXECUTABLE}"
-    ARGS -o "${POT_FILE_PATH}" --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory="${CMAKE_SOURCE_DIR}" --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
-    DEPENDS ${POT_DEPENDS}
-    COMMENT "Generating ${POT_FILE}"
+    OUTPUT "${mofile}"
+    COMMAND "${MSGMERGE_EXECUTABLE}" ARGS --quiet -o "${CMAKE_CURRENT_BINARY_DIR}/${pofile}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}" ${POT_FILE_PATH}
+    COMMAND "${MSGFMT_EXECUTABLE}" ARGS -o "${mofile}" "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
+    COMMAND "${MSGFMT_EXECUTABLE}" ARGS -c --statistics --verbose --output-file=/dev/null "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
+    DEPENDS "${POT_FILE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}"
+    COMMENT "Compiling ${polang}.po"
   )
 
-  set(MO_FILES)
-  set(UPDATE_PO_TARGETS)
-  foreach(pofile ${PO_FILES})
-    get_filename_component(polang ${pofile} NAME_WE)
-
-    # Compile .po files in build directory (to binary .mo files)
-    set(modir "${CMAKE_CURRENT_BINARY_DIR}/${polang}/LC_MESSAGES")
-    file(MAKE_DIRECTORY "${modir}")
-    set(mofile "${modir}/${PROJECT_NAME}.mo")
-    add_custom_command(
-      OUTPUT "${mofile}"
-      COMMAND "${MSGMERGE_EXECUTABLE}" ARGS --quiet -o "${CMAKE_CURRENT_BINARY_DIR}/${pofile}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}" ${POT_FILE_PATH}
-      COMMAND "${MSGFMT_EXECUTABLE}" ARGS -o "${mofile}" "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
-      COMMAND "${MSGFMT_EXECUTABLE}" ARGS -c --statistics --verbose --output-file=/dev/null "${CMAKE_CURRENT_BINARY_DIR}/${pofile}"
-      DEPENDS "${POT_FILE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}"
-      COMMENT "Compiling ${polang}.po"
-    )
-
-    # Update .po files in source directory (if needed)
-    add_custom_target(
-      update-${pofile}
-      COMMAND "${MSGMERGE_EXECUTABLE}" --quiet --update --previous --backup=none "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}" "${POT_FILE_PATH}"
-      COMMENT "Updating ${polang}.po"
-    )
-    set(UPDATE_PO_TARGETS ${UPDATE_PO_TARGETS} update-${pofile})
-
-    install(FILES "${mofile}" DESTINATION "${LOCALEDIR}/${polang}/LC_MESSAGES")
-    set(MO_FILES ${MO_FILES} ${mofile})
-  endforeach()
-
-  add_custom_target(translations ALL DEPENDS ${MO_FILES})
-
-  # Update weechat.pot in source directory (if needed)
+  # Update .po files in source directory (if needed)
   add_custom_target(
-    update-${POT_FILE}
-    COMMAND "${MSGMERGE_EXECUTABLE}" --quiet --update --backup=none "${CMAKE_CURRENT_SOURCE_DIR}/${POT_FILE}" "${POT_FILE_PATH}"
-    COMMENT "Updating ${POT_FILE}"
+    update-${pofile}
+    COMMAND "${MSGMERGE_EXECUTABLE}" --quiet --update --previous --backup=none "${CMAKE_CURRENT_SOURCE_DIR}/${pofile}" "${POT_FILE_PATH}"
+    COMMENT "Updating ${polang}.po"
   )
+  set(UPDATE_PO_TARGETS ${UPDATE_PO_TARGETS} update-${pofile})
 
-  # Update all .po and weechat.pot in source directory (if needed)
-  add_custom_target(update-po DEPENDS update-${POT_FILE} ${UPDATE_PO_TARGETS})
+  install(FILES "${mofile}" DESTINATION "${LOCALEDIR}/${polang}/LC_MESSAGES")
+  set(MO_FILES ${MO_FILES} ${mofile})
+endforeach()
 
-endif()
+add_custom_target(translations ALL DEPENDS ${MO_FILES})
+
+# Update weechat.pot in source directory (if needed)
+add_custom_target(
+  update-${POT_FILE}
+  COMMAND "${MSGMERGE_EXECUTABLE}" --quiet --update --backup=none "${CMAKE_CURRENT_SOURCE_DIR}/${POT_FILE}" "${POT_FILE_PATH}"
+  COMMENT "Updating ${POT_FILE}"
+)
+
+# Update all .po and weechat.pot in source directory (if needed)
+add_custom_target(update-po DEPENDS update-${POT_FILE} ${UPDATE_PO_TARGETS})

po/cs.po

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
-"PO-Revision-Date: 2023-06-17 11:47+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
+"PO-Revision-Date: 2023-06-25 00:48+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: cs\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #, c-format
 msgid "End of command '%s', timeout reached (%.1fs)"
-msgstr "Konec příkazu '%s', vypršel časový limit (%.lfs)"
+msgstr "Konec příkazu '%s', vypršel časový limit (%.1fs)"
 
 #, c-format
 msgid "System clock skew detected (%+ld seconds), reinitializing all timers"
@@ -2043,6 +2043,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -4423,6 +4427,22 @@ msgstr "%sChyba: nemohu vytvořit soubor \"%s\""
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sChyba při zápisu konfiguračního souboru \"%s\""
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: server %s%s%s byl zkopírován do %s%s%s"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: nemůžu načíst soubor \"%s\""
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%sVAROVÁNÍ: selhalo čtení konfiguračního souboru \"%s\" (%s)"
@@ -4518,6 +4538,11 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr "%s%s: nemohu vytvořit adresář pro logy (\"%s\")"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Proměnná prostředí \"%s\" není definována"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Chyba: domovský adresář (%s) není adresářem\n"
@@ -9203,6 +9228,10 @@ msgstr ""
 "když se změní status nepřítomnosti přezdívky (výsledek příkazu whois), "
 "například: \"notify_highlight\", \"notify_message\" or \"notify_private\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "zavřít buffer, když je na kanálu spuštěn /part"
 

po/de.po

@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
-"PO-Revision-Date: 2023-06-23 07:41+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
+"PO-Revision-Date: 2023-07-05 21:25+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de_DE\n"
@@ -2540,6 +2540,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -2611,6 +2615,11 @@ msgstr ""
 "damit die zu belegende Taste zu ermitteln. Durch diesen Schritt wird der "
 "benötigte Tasten-Code in die Befehlszeile übernommen.\n"
 "\n"
+"Für einige Tasten müssen Sie möglicherweise /debug key verwenden. Dadurch "
+"wird der Wert des Rohschlüssels angezeigt, der verwendet werden kann (zum "
+"Beispiel könnte die Taste Strg+Rücktaste \"ctrl-H\" sein \"ctrl-?\", "
+"abhängig von Ihrem Terminal und anderen Einstellungen).\n"
+"\n"
 "Zulässige Modifikatortasten (in dieser Reihenfolge, wenn mehrere verwendet "
 "werden):\n"
 "  meta- (Alt-Taste)\n"
@@ -5576,6 +5585,22 @@ msgid "%sError writing configuration file \"%s\""
 msgstr ""
 "%sEs ist ein Fehler beim Speichern der Konfigurationsdatei \"%s\" aufgetreten"
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: Server %s%s%s wurde nach %s%s%s kopiert"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: Kann die Datei \"%s\" nicht laden"
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%sWARNUNG: Konfigurationsdatei \"%s\" konnte nicht geladen werden (%s)"
@@ -5605,20 +5630,17 @@ msgid ""
 "%sError: %s, line %d: invalid config version: \"%s\" => rest of file is "
 "IGNORED, default options are used"
 msgstr ""
-"%sFehler: %s, Zeile %d: Ungültige Konfigurationsversion: \"%s\" => Der Rest"
-" der Datei wird IGNORIERT, es werden Standardoptionen verwendet"
+"%sFehler: %s, Zeile %d: Ungültige Konfigurationsversion: \"%s\" => Der Rest "
+"der Datei wird IGNORIERT, es werden Standardoptionen verwendet"
 
 #, c-format
-#| msgid ""
-#| "%sWarning: %s, version read (%d) is newer than supported version (%d), "
-#| "options may be broken!"
 msgid ""
 "%sError: %s, version read (%d) is newer than supported version (%d) => rest "
 "of file is IGNORED, default options are used"
 msgstr ""
-"%sFehler: %s, verwendete Version (%d) ist neuer als die unterstützte Version"
-" (%d) => Der Rest der Datei wird IGNORIERT, es werden Standardoptionen"
-" verwendet"
+"%sFehler: %s, verwendete Version (%d) ist neuer als die unterstützte Version "
+"(%d) => Der Rest der Datei wird IGNORIERT, es werden Standardoptionen "
+"verwendet"
 
 #, c-format
 msgid "%sWarning: %s, line %d: option outside section: %s"
@@ -5687,6 +5709,11 @@ msgstr ""
 "Fehler: es kann kein temporäres Heimatverzeichnis angelegt werden (mit "
 "Befehl: \"%s\")\n"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Umgebungsvariable \"%s\" ist nicht definiert"
+
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Fehler: \"%s\" ist kein Verzeichnis\n"
@@ -11438,6 +11465,10 @@ msgstr ""
 "(Rückgabe durch Befehl whois), zum Beispiel: \"notify_message\", "
 "\"notify_private\" oder \"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "schließt den Buffer wenn \"/part\" im Kanal ausgeführt wird"
 
@@ -16026,8 +16057,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
 
 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
@@ -16035,8 +16065,7 @@ msgid ""
 "monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "

po/es.po

@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2537,6 +2537,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -5048,6 +5052,22 @@ msgstr "%sError: no es posible crear el archivo \"%s\""
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sError al escribir el archivo de configuración \"%s\""
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: servidor %s%s%s copiado como %s%s%s"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: no es posible cargar el archivo \"%s\""
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "Guardando archivo de configuración %s %s"
@@ -5143,6 +5163,11 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr "%s%s: imposible crear directorio para registros (\"%s\")"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Variable \"%s\" no definida"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Error: home (%s) no es un directorio\n"
@@ -9902,6 +9927,10 @@ msgstr ""
 "cuando un apodo cambia su estado de ausencia (resultado del comando whois), "
 "por ejemplo: \"notify_highlight\", \"notify_message\" o \"notify_private\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "cerrar el buffer cuando /part es usado en un canal"
 

po/fr.po

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
-"PO-Revision-Date: 2023-06-17 11:46+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
+"PO-Revision-Date: 2023-10-30 23:23+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -2491,6 +2491,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -2558,6 +2562,11 @@ msgstr ""
 "d'utiliser la touche alt+k (ou Échap puis k), et puis de presser la touche à "
 "associer : cela insère le code de la touche dans la ligne de commande.\n"
 "\n"
+"Pour certaines touches vous pourriez avoir besoin d'utiliser /debug key, "
+"cela affiche le code brut de la touche qui peut être utilisé (par exemple "
+"ctrl+backspace pourrait être \"ctrl-h\" ou \"ctrl-?\", selon votre terminal "
+"et d'autres paramètres).\n"
+"\n"
 "Modificateurs autorisés (dans cet ordre lorsque plusieurs sont utilisés) :\n"
 "  meta-  (touche alt)\n"
 "  ctrl-  (touche control)\n"
@@ -3932,7 +3941,7 @@ msgstr "Ancienne touche convertie : \"%s\" => \"%s\""
 
 #, c-format
 msgid "Command converted for key \"%s\": \"%s\" => \"%s\""
-msgstr "Commande convertie pour la touche\"%s\" : \"%s\" => \"%s\""
+msgstr "Commande convertie pour la touche \"%s\" : \"%s\" => \"%s\""
 
 msgid "debug level for plugin (\"core\" for WeeChat core)"
 msgstr "niveau de debug pour l'extension (\"core\" pour le cœur de WeeChat)"
@@ -5443,6 +5452,22 @@ msgstr "%sImpossible de créer le fichier \"%s\""
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sErreur d'écriture du fichier de configuration \"%s\""
 
+#, c-format
+msgid "%sFile %s has been backed up as %s"
+msgstr "%sLe fichier %s a été sauvegardé sous le nom %s"
+
+#, c-format
+msgid "%sError: unable to backup file %s"
+msgstr "%sErreur : impossible de sauvegarder le fichier %s"
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+"%sImportant : le fichier %s a été mis à jour de la version %d à %d, il n'est "
+"plus compatible et ne peut plus être chargé avec toute version plus ancienne"
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%sATTENTION : échec de lecture du fichier de configuration \"%s\" (%s)"
@@ -5552,6 +5577,9 @@ msgstr ""
 "Erreur : impossible de créer le répertoire de base temporaire (en utilisant "
 "le modèle : \"%s\")\n"
 
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Erreur : la variable d'environnement \"HOME\" n'est pas définie\n"
+
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Erreur : \"%s\" n'est pas un répertoire\n"
@@ -11217,6 +11245,12 @@ msgstr ""
 "de la commande whois), par exemple : \"notify_message\", \"notify_private\" "
 "ou \"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+"ouvrir un tampon privé sur son propre message quand la capacité echo-message "
+"est activée"
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "fermer le tampon lorsque /part est exécuté sur un canal"
 

po/hu.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1868,6 +1868,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -3968,6 +3972,20 @@ msgstr "%s nem sikerült a \"%s\" fájlt létrehozni\n"
 msgid "%sError writing configuration file \"%s\""
 msgstr "szerver konfigurációs fájljának újraolvastatása"
 
+#, fuzzy, c-format
+msgid "%sFile %s has been backed up as %s"
+msgstr "A %s%s%s szerver másolva lett %s%s néven\n"
+
+#, fuzzy, c-format
+msgid "%sError: unable to backup file %s"
+msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "beállítások mentése kilépéskor"
@@ -4062,6 +4080,10 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr "%s nem sikerült a szervert létrehozni\n"
 
+#, fuzzy
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "  . típus: szám\n"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "%s nem sikerült a \"%s\" könyvtárat létrehozni\n"
@@ -8662,6 +8684,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 

po/it.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2125,6 +2125,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -4685,6 +4689,22 @@ msgstr "%sErrore: impossibile creare il file \"%s\""
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sErrore: impossibile scrivere sul file di configurazione \"%s\""
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: il server %s%s%s è stato copiato in %s%s%s"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: impossibile caricare il file \"%s\""
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "Salvataggio del file di configurazione %s %s"
@@ -4780,6 +4800,10 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr "%s%s: impossibile creare la directory per i log (\"%s\")"
 
+#, fuzzy
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Variabili"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Errore: home (%s) non è una directory\n"
@@ -9627,6 +9651,10 @@ msgstr ""
 "whois), ad esempio: \"notify_message\", \"notify_private\" o "
 "\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "chiude buffer quando viene digitato /part nel canale"
 

po/ja.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -2506,6 +2506,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -5290,6 +5294,22 @@ msgstr "%sエラー: ファイル \"%s\" の作成に失敗"
 msgid "%sError writing configuration file \"%s\""
 msgstr "%s設定ファイル \"%s\" の書き込み中にエラー"
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: サーバ %s%s%s を %s%s%s にコピーしました"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: ファイル \"%s\" をロードできません"
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%s警告: 設定ファイル \"%s\" (%s) の読み込みに失敗"
@@ -5387,6 +5407,11 @@ msgid ""
 msgstr ""
 "エラー: 一時的なホームディレクリ (テンプレート: \"%s\") を作成できません\n"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "環境変数 \"%s\" が定義されていません"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "エラー: ホーム (%s) はディレクトリではありません\n"
@@ -10807,6 +10832,10 @@ msgstr ""
 "よって表示されたメッセージに使われたタグのコンマ区切りリスト、例: "
 "\"notify_message\"、\"notify_private\"、\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "/part を実行した場合にバッファを閉じる"
 

po/pl.po

@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -2838,6 +2838,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -5727,6 +5731,22 @@ msgstr "%sNie można utworzyć pliku \"%s\""
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sBłąd podczas zapisu pliku konfiguracyjnego \"%s\""
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: serwer %s%s%s został skopiowany do %s%s%s"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: nie można wczytać pliku \"%s\""
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%sUWAGA: nie powiódł się odczyt pliku konfiguracyjnego \"%s\" (%s)"
@@ -5830,6 +5850,11 @@ msgstr ""
 "Błąd: nie można utworzyć tymczasowego katalogu domowego (używając szablonu: "
 "\"%s\")\n"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Zmienna środowiskowa \"%s\" nie jest zdefiniowana"
+
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Błąd: „%s” nie jest katalogiem\n"
@@ -11803,6 +11828,10 @@ msgstr ""
 "komendy whois), na przykład: \"notify_message\", \"notify_private\" or "
 "\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "zamyka bufor, kiedy na kanale wykonamy /part"
 

po/pt.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -2499,6 +2499,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -5320,6 +5324,22 @@ msgstr "%sErro: não é possível criar o ficheiro \"%s\""
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sErro ao escrever o ficheiro de configuração \"%s\""
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: o servidor %s%s%s foi copiado para %s%s%s"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: não foi possível carregar o ficheiro \"%s\""
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%sAVISO: falha ao ler o ficheiro de configuração \"%s\" (%s)"
@@ -5417,6 +5437,11 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr "%s%s: não foi possível criar diretório para registos (\"%s\")"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "A variável de ambiente \"%s\" não está definida"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Erro: a base (%s) não é um diretório\n"
@@ -10574,6 +10599,10 @@ msgstr ""
 "whois), por exemplo: \"notify_message\", \"notify_private\" ou "
 "\"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "fechar o buffer ao executar /part num canal"
 

po/pt_BR.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2202,6 +2202,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -4694,6 +4698,22 @@ msgstr "%sErro: não foi possível criar arquivo \"%s\""
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sErro escrevendo arquivo de configuração \"%s\""
 
+#, fuzzy, c-format
+#| msgid "Layout \"%s\" has been renamed to \"%s\""
+msgid "%sFile %s has been backed up as %s"
+msgstr "Disposição \"%s\" renomeado para \"%s\""
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: não foi possível carregar arquivo \"%s\""
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "Escrevendo arquivo de configurações %s %s"
@@ -4787,6 +4807,10 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr "%s%s: não foi possível criar diretório para registros (\"%s\")"
 
+#, fuzzy
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Variáveis"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Erro: (%s) não é um diretório\n"
@@ -9205,6 +9229,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "fechar buffer quando o comando /part é executado em um canal"
 

po/ru.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1889,6 +1889,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -3996,6 +4000,20 @@ msgstr "%s не могу создать файл \"%s\"\n"
 msgid "%sError writing configuration file \"%s\""
 msgstr "перезагрузить конфигурационный файл сервера"
 
+#, fuzzy, c-format
+msgid "%sFile %s has been backed up as %s"
+msgstr "Сервер %s%s%s скопирован в %s%s\n"
+
+#, fuzzy, c-format
+msgid "%sError: unable to backup file %s"
+msgstr "Не могу записать лог-файл \"%s\"\n"
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "сохранять конфигурационный файл при выходе"
@@ -4090,6 +4108,10 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr "%s не могу создать сервер \"%s\"\n"
 
+#, fuzzy
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "  . тип: целочисленный\n"
+
 #, fuzzy, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "%s домашний каталог (%s) не является директорией\n"
@@ -8694,6 +8716,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 

po/sr.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2424,6 +2424,71 @@ msgstr ""
 "<контекст> <тастер> || resetall -yes [<контекст>] || missing [<контекст>] || "
 "legacy <тастер> [<тастер>...]"
 
+#, fuzzy
+#| msgid ""
+#| "       list: list all current keys\n"
+#| "listdefault: list default keys\n"
+#| "   listdiff: list differences between current and default keys (keys "
+#| "added, redefined or deleted)\n"
+#| "    context: name of context (\"default\" or \"search\")\n"
+#| "       bind: bind a command to a key or display command bound to key (for "
+#| "context \"default\")\n"
+#| "   bindctxt: bind a command to a key or display command bound to key, for "
+#| "given context\n"
+#| "    command: command (many commands can be separated by semicolons)\n"
+#| "     unbind: remove a key binding (for context \"default\")\n"
+#| " unbindctxt: remove a key binding for given context\n"
+#| "      reset: reset a key to default binding (for context \"default\")\n"
+#| "  resetctxt: reset a key to default binding, for given context\n"
+#| "   resetall: restore bindings to the default values and delete ALL "
+#| "personal bindings (use carefully!)\n"
+#| "    missing: add missing keys (using default bindings), useful after "
+#| "installing new WeeChat version\n"
+#| "     legacy: display new name for legacy keys\n"
+#| "\n"
+#| "When binding a command to a key, it is recommended to use key alt+k (or "
+#| "Esc then k), and then press the key to bind: this will insert key name in "
+#| "command line.\n"
+#| "\n"
+#| "Modifiers allowed (in this order when multiple are used):\n"
+#| "  meta-  (alt key)\n"
+#| "  ctrl-  (control key)\n"
+#| "  shift-  (shift key, can only be used with key names below)\n"
+#| "\n"
+#| "Key names allowed: f0 to f20, home, insert, delete, end, backspace, pgup, "
+#| "pgdn, up, down, right, left, tab, return, comma, space.\n"
+#| "\n"
+#| "Combo of keys must be separated by a comma.\n"
+#| "\n"
+#| "For context \"mouse\" (possible in context \"cursor\" too), key has "
+#| "format: \"@area:key\" or \"@area1>area2:key\" where area can be:\n"
+#| "          *: any area on screen\n"
+#| "       chat: chat area (any buffer)\n"
+#| "  chat(xxx): chat area for buffer with name \"xxx\" (full name including "
+#| "plugin)\n"
+#| "     bar(*): any bar\n"
+#| "   bar(xxx): bar \"xxx\"\n"
+#| "    item(*): any bar item\n"
+#| "  item(xxx): bar item \"xxx\"\n"
+#| "Wildcard \"*\" is allowed in key to match many mouse events.\n"
+#| "A special value for command with format \"hsignal:name\" can be used for "
+#| "context mouse, this will send the hsignal \"name\" with the focus "
+#| "hashtable as argument.\n"
+#| "Another special value \"-\" can be used to disable key (it will be "
+#| "ignored when looking for keys).\n"
+#| "\n"
+#| "Examples:\n"
+#| "  key alt-r to jump to #weechat IRC channel:\n"
+#| "    /key bind meta-r /buffer #weechat\n"
+#| "  restore default binding for key alt-r:\n"
+#| "    /key reset meta-r\n"
+#| "  key meta-v then f1 to run /help:\n"
+#| "    /key bind meta-v,f1 /help\n"
+#| "  key \"tab\" to stop search in buffer:\n"
+#| "    /key bindctxt search tab /input search_stop\n"
+#| "  middle button of mouse on a nick to retrieve info on nick:\n"
+#| "    /key bindctxt mouse @item(buffer_nicklist):button3 /msg nickserv info "
+#| "${nick}"
 msgid ""
 "       list: list all current keys\n"
 "listdefault: list default keys\n"
@@ -2449,6 +2514,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -5308,6 +5377,22 @@ msgstr "%sНе може да се креира фајл „%s”"
 msgid "%sError writing configuration file \"%s\""
 msgstr "%sГрешка при уписивању конфигурационог фајла „%s”"
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: сервер %s%s%s је копиран у %s%s%s"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: фајл „%s” не може да се учита"
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%sУПОЗОРЕЊЕ: није могао да се прочита конфигурациони фајл „%s” (%s)"
@@ -5419,6 +5504,11 @@ msgstr ""
 "Грешка: не може да се креира привремени почетни директоријум (користећи "
 "шаблон: \"%s\")\n"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Није дефинисана променљива окружења „%s”"
+
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Грешка: „%s” није директоријум\n"
@@ -10943,6 +11033,10 @@ msgstr ""
 "се статус одсуства надимка промени (резултат команде whois), на пример: "
 "„notify_message”, „notify_private” или „notify_highlight”"
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "затварање бафера када се на каналу изврши /part"
 

po/tr.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2023-06-17 11:47+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2536,6 +2536,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -5371,6 +5375,22 @@ msgstr "%s\"%s\" dosyası oluşturulamıyor"
 msgid "%sError writing configuration file \"%s\""
 msgstr "%s\"%s\" yapılandırma dosyası yazılırken hata"
 
+#, fuzzy, c-format
+#| msgid "%s: server %s%s%s has been copied to %s%s%s"
+msgid "%sFile %s has been backed up as %s"
+msgstr "%s: %s%s%s sunucusu %s%s%s konumuna kopyalandı"
+
+#, fuzzy, c-format
+#| msgid "%s%s: unable to load file \"%s\""
+msgid "%sError: unable to backup file %s"
+msgstr "%s%s: \"%s\" dosyası yüklenemiyor"
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr "%sUYARI: \"%s\" yapılandırma dosyası okunamadı (%s)"
@@ -5468,6 +5488,11 @@ msgid ""
 msgstr ""
 "Hata: Geçici bir ev dizini oluşturulamıyor (kullanılan şablon: \"%s\")\n"
 
+#, fuzzy
+#| msgid "Environment variable \"%s\" is not defined"
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr "Ortam değişkeni \"%s\" tanımlanmamış"
+
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr "Hata: \"%s\" bir dizin değil\n"
@@ -11373,6 +11398,10 @@ msgstr ""
 "kullanılan etiketlerin virgülle ayrılmış listesi (komut whois'inin sonucu); "
 "örneğin: \"notify_message\", \"notify_private\" veya \"notify_highlight\""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr "bir kanalda /part verildiğinde arabelleği kapat"
 

po/weechat.pot

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2023-06-17 11:44+0200\n"
+"POT-Creation-Date: 2023-10-30 23:09+0100\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1726,6 +1726,10 @@ msgid ""
 "then k), and then press the key to bind: this will insert key name in "
 "command line.\n"
 "\n"
+"For some keys you might need to use /debug key, this displays the raw key "
+"code that can be used (for example the key ctrl+backspace could be \"ctrl-"
+"h\" or \"ctrl-?\", depending on your terminal and other settings).\n"
+"\n"
 "Modifiers allowed (in this order when multiple are used):\n"
 "  meta-  (alt key)\n"
 "  ctrl-  (control key)\n"
@@ -3620,6 +3624,20 @@ msgstr ""
 msgid "%sError writing configuration file \"%s\""
 msgstr ""
 
+#, c-format
+msgid "%sFile %s has been backed up as %s"
+msgstr ""
+
+#, c-format
+msgid "%sError: unable to backup file %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%sImportant: file %s has been updated from version %d to %d, it is not "
+"compatible and can not be loaded any more with any older version"
+msgstr ""
+
 #, c-format
 msgid "%sWARNING: failed to read configuration file \"%s\" (%s)"
 msgstr ""
@@ -3712,6 +3730,9 @@ msgid ""
 "Error: unable to create a temporary home directory (using template: \"%s\")\n"
 msgstr ""
 
+msgid "Error: environment variable \"HOME\" is not defined\n"
+msgstr ""
+
 #, c-format
 msgid "Error: \"%s\" is not a directory\n"
 msgstr ""
@@ -7771,6 +7792,10 @@ msgid ""
 "\"notify_message\", \"notify_private\" or \"notify_highlight\""
 msgstr ""
 
+msgid ""
+"open a private buffer on self message when capability echo-message is enabled"
+msgstr ""
+
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 

src/core/hook/wee-hook-process.c

@@ -146,6 +146,7 @@ hook_process_hashtable (struct t_weechat_plugin *plugin,
         ptr_value = hashtable_get (options, "buffer_flush");
         if (ptr_value && ptr_value[0])
         {
+            error = NULL;
             number = strtol (ptr_value, &error, 10);
             if (error && !error[0]
                 && (number >= 1) && (number <= HOOK_PROCESS_BUFFER_SIZE))

src/core/wee-command.c

@@ -736,6 +736,7 @@ COMMAND_CALLBACK(buffer)
                     else
                     {
                         ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
+                        error = NULL;
                         (void) strtol (argv[i], &error, 10);
                         clear_number = (error && !error[0]);
                     }
@@ -971,6 +972,7 @@ COMMAND_CALLBACK(buffer)
                     ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
                     if (ptr_buffer)
                     {
+                        error = NULL;
                         (void) strtol (argv[i], &error, 10);
                         if (error && !error[0])
                         {
@@ -1009,6 +1011,7 @@ COMMAND_CALLBACK(buffer)
                     ptr_buffer = gui_buffer_search_by_number_or_name (argv[i]);
                     if (ptr_buffer)
                     {
+                        error = NULL;
                         (void) strtol (argv[i], &error, 10);
                         if (error && !error[0])
                         {
@@ -3534,28 +3537,12 @@ COMMAND_CALLBACK(input)
     else if (string_strcmp (argv[1], "grab_key") == 0)
     {
         gui_input_grab_key (buffer,
-                            0, /* raw_key */
-                            0, /* command */
-                            (argc > 2) ? argv[2] : NULL);
-    }
-    else if (string_strcmp (argv[1], "grab_raw_key") == 0)
-    {
-        gui_input_grab_key (buffer,
-                            1, /* raw_key */
                             0, /* command */
                             (argc > 2) ? argv[2] : NULL);
     }
     else if (string_strcmp (argv[1], "grab_key_command") == 0)
     {
         gui_input_grab_key (buffer,
-                            0, /* raw_key */
-                            1, /* command */
-                            (argc > 2) ? argv[2] : NULL);
-    }
-    else if (string_strcmp (argv[1], "grab_raw_key_command") == 0)
-    {
-        gui_input_grab_key (buffer,
-                            1, /* raw_key */
                             1, /* command */
                             (argc > 2) ? argv[2] : NULL);
     }
@@ -8433,7 +8420,7 @@ command_init ()
         "move_next_word || move_previous_line || move_next_line || "
         "history_previous || history_next || history_global_previous || "
         "history_global_next || "
-        "grab_key || grab_raw_key || grab_raw_key_command || grab_key_command || "
+        "grab_key || grab_key_command || "
         "grab_mouse || grab_mouse_area || "
         "insert || send",
         &command_input, NULL, NULL);
@@ -8538,6 +8525,11 @@ command_init ()
            "(or Esc then k), and then press the key to bind: this will insert "
            "key name in command line.\n"
            "\n"
+           "For some keys you might need to use /debug key, this displays "
+           "the raw key code that can be used (for example the key "
+           "ctrl+backspace could be \"ctrl-h\" or \"ctrl-?\", depending on your "
+           "terminal and other settings).\n"
+           "\n"
            "Modifiers allowed (in this order when multiple are used):\n"
            "  meta-  (alt key)\n"
            "  ctrl-  (control key)\n"

src/core/wee-config-file.c

@@ -37,6 +37,7 @@
 #include "wee-config-file.h"
 #include "wee-arraylist.h"
 #include "wee-config.h"
+#include "wee-dir.h"
 #include "wee-hashtable.h"
 #include "wee-hdata.h"
 #include "wee-hook.h"
@@ -1527,22 +1528,22 @@ config_file_option_set (struct t_config_option *option, const char *value,
                         {
                             error = NULL;
                             number = strtol (value + 2, &error, 10);
-                            if (error && !error[0])
+                            if (error && !error[0]
+                                && (long)old_value + number <= (long)(option->max))
                             {
                                 value_int = old_value + number;
-                                if (value_int <= option->max)
-                                    new_value_ok = 1;
+                                new_value_ok = 1;
                             }
                         }
                         else if (strncmp (value, "--", 2) == 0)
                         {
                             error = NULL;
                             number = strtol (value + 2, &error, 10);
-                            if (error && !error[0])
+                            if (error && !error[0]
+                                && (long)old_value - number >= (long)(option->min))
                             {
                                 value_int = old_value - number;
-                                if (value_int >= option->min)
-                                    new_value_ok = 1;
+                                new_value_ok = 1;
                             }
                         }
                         else
@@ -3154,6 +3155,10 @@ config_file_parse_version (const char *version)
     long number;
     char *error;
 
+    if (!version)
+        return -1;
+
+    error = NULL;
     number = strtoll (version, &error, 10);
     if (!error || error[0])
         return -1;
@@ -3161,6 +3166,66 @@ config_file_parse_version (const char *version)
     return (number < 1) ? -1 : (int)number;
 }
 
+/*
+ * Backups a configuration file if its version is unsupported and cannot be
+ * loaded.
+ */
+
+void
+config_file_backup (const char *filename)
+{
+    char *filename_backup, str_time[32], str_index[32];
+    int length, index;
+    struct tm *local_time;
+    time_t date;
+
+    if (!filename)
+        return;
+
+    length = strlen (filename) + 128;
+
+    filename_backup = malloc (length);
+    if (!filename_backup)
+        return;
+
+    date = time (NULL);
+    local_time = localtime (&date);
+    if (strftime (str_time, sizeof (str_time), ".%Y%m%d.%H%M%S", local_time) == 0)
+        str_time[0] = '\0';
+
+    index = 1;
+    while (1)
+    {
+        if (index == 1)
+            str_index[0] = '\0';
+        else
+            snprintf (str_index, sizeof (str_index), ".%d", index);
+        snprintf (filename_backup, length,
+                  "%s.backup%s%s",
+                  filename, str_time, str_index);
+        if (access (filename_backup, F_OK) != 0)
+            break;
+        index++;
+    }
+
+    if (dir_file_copy (filename, filename_backup))
+    {
+        gui_chat_printf (NULL,
+                         _("%sFile %s has been backed up as %s"),
+                         gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                         filename, filename_backup);
+    }
+    else
+    {
+        gui_chat_printf (NULL,
+                         _("%sError: unable to backup file %s"),
+                         gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                         filename);
+    }
+
+    free (filename_backup);
+}
+
 /*
  * Updates data read from config file: either section or option + value.
  * The update callback (if defined in config) is called if the config version
@@ -3173,16 +3238,22 @@ config_file_parse_version (const char *version)
  *
  * Section can be updated only if option and value are NULL (ie if we are
  * reading a section line like "[section]").
+ *
+ * Integer warning_update_displayed is set to 1 if a warning is displayed,
+ * when the file is updated to a newer version (then it's not compatible any
+ * more with previous versions).
  */
 
 void
 config_file_update_data_read (struct t_config_file *config_file,
+                              const char *filename,
                               const char *section,
                               const char *option,
                               const char *value,
                               char **ret_section,
                               char **ret_option,
-                              char **ret_value)
+                              char **ret_value,
+                              int *warning_update_displayed)
 {
     struct t_hashtable *data_read, *hashtable;
     const char *ptr_section, *ptr_option, *ptr_value;
@@ -3192,6 +3263,21 @@ config_file_update_data_read (struct t_config_file *config_file,
     if (config_file->version_read >= config_file->version)
         return;
 
+    if (!*warning_update_displayed
+        && (config_file->version_read < config_file->version))
+    {
+        gui_chat_printf (
+            NULL,
+            _("%sImportant: file %s has been updated from version %d to %d, "
+              "it is not compatible and can not be loaded any more with any "
+              "older version"),
+            gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+            filename,
+            config_file->version_read,
+            config_file->version);
+        *warning_update_displayed = 1;
+    }
+
     /* do nothing if there's no update callback */
     if (!config_file->callback_update)
         return;
@@ -3289,6 +3375,7 @@ int
 config_file_read_internal (struct t_config_file *config_file, int reload)
 {
     int filename_length, line_number, rc, length, version;
+    int warning_update_displayed;
     char *filename, *section, *option, *value;
     struct t_config_section *ptr_section;
     struct t_config_option *ptr_option;
@@ -3298,6 +3385,7 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
         return WEECHAT_CONFIG_READ_FILE_NOT_FOUND;
 
     config_file->version_read = 1;
+    warning_update_displayed = 0;
 
     /* build filename */
     filename_length = strlen (weechat_config_dir) + strlen (DIR_SEPARATOR) +
@@ -3396,9 +3484,10 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
                 section = string_strndup (ptr_line + 1, pos - ptr_line - 1);
                 if (section)
                 {
-                    config_file_update_data_read (config_file,
+                    config_file_update_data_read (config_file, filename,
                                                   section, NULL, NULL,
-                                                  &section, NULL, NULL);
+                                                  &section, NULL, NULL,
+                                                  &warning_update_displayed);
                     ptr_section = config_file_search_section (config_file,
                                                               section);
                     if (!ptr_section)
@@ -3480,6 +3569,11 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
                     gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                     filename, line_number,
                     line);
+                config_file_backup (filename);
+                if (option)
+                    free (option);
+                if (value)
+                    free (value);
                 goto end_file;
             }
             else
@@ -3496,6 +3590,11 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
                         filename,
                         config_file->version_read,
                         config_file->version);
+                    config_file_backup (filename);
+                    if (option)
+                        free (option);
+                    if (value)
+                        free (value);
                     goto end_file;
                 }
             }
@@ -3513,9 +3612,10 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
             goto end_line;
         }
 
-        config_file_update_data_read (config_file,
+        config_file_update_data_read (config_file, filename,
                                       ptr_section->name, option, value,
-                                      NULL, &option, &value);
+                                      NULL, &option, &value,
+                                      &warning_update_displayed);
 
         /* option has been ignored by the update callback? */
         if (!option || !option[0])

src/core/wee-config.c

@@ -1601,7 +1601,24 @@ config_weechat_update_cb (const void *pointer, void *data,
             }
             else
             {
-                new_option = gui_key_legacy_to_alias (ptr_option);
+                /*
+                 * if backspace or ctrl-backspace was manually bound to a
+                 * different command, keep the key as-is (in lower case) ;
+                 * in all other cases, convert the key to the new name
+                 */
+                if (ptr_section
+                    && (strcmp (ptr_section, "key") == 0)
+                    && ((strcmp (ptr_option, "ctrl-H") == 0)
+                        || (strcmp (ptr_option, "ctrl-?") == 0))
+                    && (ptr_value
+                        && (strcmp (ptr_value, "/input delete_previous_char") != 0)))
+                {
+                    new_option = string_tolower (ptr_option);
+                }
+                else
+                {
+                    new_option = gui_key_legacy_to_alias (ptr_option);
+                }
                 if (new_option)
                 {
                     if (strcmp (ptr_option, new_option) != 0)
@@ -1612,6 +1629,18 @@ config_weechat_update_cb (const void *pointer, void *data,
                             ptr_option, new_option);
                         hashtable_set (data_read, "option", new_option);
                         changes++;
+                        if (ptr_section
+                            && (strcmp (ptr_section, "key") == 0)
+                            && (strcmp (new_option, "return") == 0)
+                            && (!ptr_value
+                                || (strcmp (ptr_value, "/input return") != 0)))
+                        {
+                            gui_chat_printf (
+                                NULL,
+                                _("Command converted for key \"%s\": \"%s\" => \"%s\""),
+                                "return", ptr_value, "/input return");
+                            hashtable_set (data_read, "value", "/input return");
+                        }
                     }
                     free (new_option);
                 }
@@ -2166,17 +2195,20 @@ config_weechat_custom_bar_item_read_cb (const void *pointer, void *data,
     if (!ptr_temp_item)
     {
         /* create new temporary custom bar item */
-        ptr_temp_item = gui_bar_item_custom_alloc (item_name);
-        if (ptr_temp_item)
+        if (gui_bar_item_search_default (item_name) < 0)
         {
-            /* add new custom bar item at the end */
-            ptr_temp_item->prev_item = last_gui_temp_custom_bar_item;
-            ptr_temp_item->next_item = NULL;
-            if (last_gui_temp_custom_bar_item)
-                last_gui_temp_custom_bar_item->next_item = ptr_temp_item;
-            else
-                gui_temp_custom_bar_items = ptr_temp_item;
-            last_gui_temp_custom_bar_item = ptr_temp_item;
+            ptr_temp_item = gui_bar_item_custom_alloc (item_name);
+            if (ptr_temp_item)
+            {
+                /* add new custom bar item at the end */
+                ptr_temp_item->prev_item = last_gui_temp_custom_bar_item;
+                ptr_temp_item->next_item = NULL;
+                if (last_gui_temp_custom_bar_item)
+                    last_gui_temp_custom_bar_item->next_item = ptr_temp_item;
+                else
+                    gui_temp_custom_bar_items = ptr_temp_item;
+                last_gui_temp_custom_bar_item = ptr_temp_item;
+            }
         }
     }
 
@@ -2197,6 +2229,13 @@ config_weechat_custom_bar_item_read_cb (const void *pointer, void *data,
                              section->name, option_name, value);
         }
     }
+    else
+    {
+        gui_chat_printf (NULL,
+                         _("%sUnable to add custom bar item \"%s\""),
+                         gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+                         item_name);
+    }
 
     free (item_name);
 
@@ -2437,27 +2476,6 @@ config_weechat_layout_write_cb (const void *pointer, void *data,
     return WEECHAT_CONFIG_WRITE_OK;
 }
 
-/*
- * Checks notify option value.
- *
- * Returns:
- *   1: value OK
- *   0: invalid value
- */
-
-int
-config_weechat_notify_check_cb (const void *pointer, void *data,
-                                 struct t_config_option *option,
-                                 const char *value)
-{
-    /* make C compiler happy */
-    (void) pointer;
-    (void) data;
-    (void) option;
-
-    return (gui_buffer_search_notify (value) >= 0) ? 1 : 0;
-}
-
 /*
  * Callback for changes on a notify option.
  */
@@ -2520,7 +2538,7 @@ config_weechat_notify_create_option_cb (const void *pointer, void *data,
                         option_name, "integer", _("Notify level for buffer"),
                         "none|highlight|message|all",
                         0, 0, "", value, 0,
-                        &config_weechat_notify_check_cb, NULL, NULL,
+                        NULL, NULL, NULL,
                         &config_weechat_notify_change_cb, NULL, NULL,
                         NULL, NULL, NULL);
                     rc = (ptr_option) ?

src/core/wee-crypto.c

@@ -421,6 +421,10 @@ weecrypto_totp_generate_internal (const char *secret, int length_secret,
     int rc, offset, length;
     unsigned long bin_code;
 
+#if __BYTE_ORDER == __BIG_ENDIAN
+    /* Big endian does not need to swap bytes here! */
+    moving_factor_swapped = moving_factor;
+#else
     moving_factor_swapped = (moving_factor >> 56)
         | ((moving_factor << 40) & 0x00FF000000000000)
         | ((moving_factor << 24) & 0x0000FF0000000000)
@@ -429,6 +433,7 @@ weecrypto_totp_generate_internal (const char *secret, int length_secret,
         | ((moving_factor >> 24) & 0x0000000000FF0000)
         | ((moving_factor >> 40) & 0x000000000000FF00)
         | (moving_factor << 56);
+#endif
 
     rc = weecrypto_hmac (secret, length_secret,
                          &moving_factor_swapped, sizeof (moving_factor_swapped),

src/core/wee-dir.c

@@ -440,6 +440,9 @@ dir_find_xdg_dirs (char **config_dir, char **data_dir, char **cache_dir,
     *runtime_dir = NULL;
 
     ptr_home = getenv ("HOME");
+    if (!ptr_home)
+        goto error_home;
+
     xdg_config_home = getenv ("XDG_CONFIG_HOME");
     xdg_data_home = getenv ("XDG_DATA_HOME");
     xdg_cache_home = getenv ("XDG_CACHE_HOME");
@@ -460,7 +463,7 @@ dir_find_xdg_dirs (char **config_dir, char **data_dir, char **cache_dir,
     }
     *config_dir = strdup (path);
     if (!*config_dir)
-        goto error;
+        goto error_memory;
 
     /* set data dir: $XDG_DATA_HOME/weechat or $HOME/.local/share/weechat */
     if (xdg_data_home && xdg_data_home[0])
@@ -478,7 +481,7 @@ dir_find_xdg_dirs (char **config_dir, char **data_dir, char **cache_dir,
     }
     *data_dir = strdup (path);
     if (!*data_dir)
-        goto error;
+        goto error_memory;
 
     /* set cache dir: $XDG_CACHE_HOME/weechat or $HOME/.cache/weechat */
     if (xdg_cache_home && xdg_cache_home[0])
@@ -495,7 +498,7 @@ dir_find_xdg_dirs (char **config_dir, char **data_dir, char **cache_dir,
     }
     *cache_dir = strdup (path);
     if (!*cache_dir)
-        goto error;
+        goto error_memory;
 
     /* set runtime dir: $XDG_RUNTIME_DIR/weechat or same as cache dir */
     if (xdg_runtime_dir && xdg_runtime_dir[0])
@@ -510,10 +513,19 @@ dir_find_xdg_dirs (char **config_dir, char **data_dir, char **cache_dir,
         *runtime_dir = strdup (*cache_dir);
     }
     if (!*runtime_dir)
-        goto error;
+        goto error_memory;
 
     return 1;
 
+error_home:
+    string_fprintf (stderr,
+                    _("Error: environment variable \"HOME\" is not defined\n"));
+    goto error;
+
+error_memory:
+    string_fprintf (stderr, _("Error: not enough memory\n"));
+    goto error;
+
 error:
     if (*config_dir)
     {
@@ -535,7 +547,6 @@ error:
         free (*runtime_dir);
         *runtime_dir = NULL;
     }
-    string_fprintf (stderr, _("Error: not enough memory\n"));
     return 0;
 }
 

src/core/wee-doc.c

@@ -30,6 +30,7 @@
 #include <libintl.h>
 #include <locale.h>
 #include <gcrypt.h>
+#include <regex.h>
 
 #include "weechat.h"
 #include "wee-arraylist.h"
@@ -46,7 +47,8 @@
 #include "wee-utf8.h"
 #include "../plugins/plugin.h"
 
-#define ESCAPE(msg) (doc_gen_escape (msg))
+#define ESCAPE_TABLE(msg) (doc_gen_escape_table (msg))
+#define ESCAPE_ANCHOR(msg) (doc_gen_escape_anchor_link (msg))
 #define TRANS(msg) ((msg && msg[0]) ? _(msg) : msg)
 #define TRANS_DEF(msg, def) ((msg && msg[0]) ? _(msg) : def)
 #define PLUGIN(plugin) ((plugin) ? plugin->name : "weechat")
@@ -62,7 +64,7 @@ char *string_escaped[32];
  */
 
 char *
-doc_gen_escape (const char *message)
+doc_gen_escape_table (const char *message)
 {
     index_string_escaped = (index_string_escaped + 1) % 32;
 
@@ -74,6 +76,31 @@ doc_gen_escape (const char *message)
     return string_escaped[index_string_escaped];
 }
 
+/*
+ * Escapes a string to be used as anchor link: replace ",", "@" and "*" by "-".
+ */
+
+char *
+doc_gen_escape_anchor_link (const char *message)
+{
+    regex_t regex;
+
+    if (string_regcomp (&regex, "[,@*():&|]+", REG_EXTENDED) != 0)
+        return NULL;
+
+    index_string_escaped = (index_string_escaped + 1) % 32;
+
+    if (string_escaped[index_string_escaped])
+        free (string_escaped[index_string_escaped]);
+
+    string_escaped[index_string_escaped] = string_replace_regex (
+        message, &regex, "-", '$', NULL, NULL);
+
+    regfree (&regex);
+
+    return string_escaped[index_string_escaped];
+}
+
 /*
  * Opens a file for write using:
  *   - path
@@ -99,7 +126,7 @@ doc_gen_open_file (const char *path, const char *doc, const char *name,
     if (!file)
     {
         string_fprintf (stderr,
-                        "doc generator: ERROR: unable to write file \"%s\"",
+                        "doc generator: ERROR: unable to write file \"%s\"\n",
                         filename);
         return NULL;
     }
@@ -435,7 +462,7 @@ doc_gen_user_options (const char *path, const char *lang)
     struct t_config_option *ptr_option;
     struct t_arraylist *list_options;
     int i, list_size, index_option;
-    char *name_escaped, *desc_escaped, *values, str_values[256];
+    char *desc_escaped, *values, str_values[256];
     char *default_value, *tmp;
 
     file = doc_gen_open_file (path, "user", "options", lang);
@@ -489,15 +516,14 @@ doc_gen_user_options (const char *path, const char *lang)
         }
         if (index_option > 0)
             string_fprintf (file, "\n");
-        name_escaped = string_replace (ptr_option->name, ",", "_");
         desc_escaped = (ptr_option->description) ?
             string_replace (TRANS(ptr_option->description), "]", "\\]") :
             strdup ("");
         string_fprintf (file,
-                        "* [[option_%s.%s.%s]] *%s.%s.%s*\n",
+                        "* [[option_%s.%s.%s]] *pass:none[%s.%s.%s]*\n",
                         ptr_option->config_file->name,
                         ptr_option->section->name,
-                        name_escaped,
+                        ESCAPE_ANCHOR(ptr_option->name),
                         ptr_option->config_file->name,
                         ptr_option->section->name,
                         ptr_option->name);
@@ -568,8 +594,6 @@ doc_gen_user_options (const char *path, const char *lang)
             (ptr_option->type == CONFIG_OPTION_TYPE_STRING) ? "\"" : "",
             default_value,
             (ptr_option->type == CONFIG_OPTION_TYPE_STRING) ? "\"" : "");
-        if (name_escaped)
-            free (name_escaped);
         if (desc_escaped)
             free (desc_escaped);
         if (values)
@@ -578,10 +602,13 @@ doc_gen_user_options (const char *path, const char *lang)
             free (default_value);
     }
 
-    string_fprintf (
-        file,
-        "// end::%s_options[]\n",
-        old_config->name);
+    if (old_config)
+    {
+        string_fprintf (
+            file,
+            "// end::%s_options[]\n",
+            old_config->name);
+    }
 
     arraylist_free (list_options);
 
@@ -614,9 +641,9 @@ doc_gen_user_default_aliases (const char *path, const char *lang)
         "[width=\"100%\",cols=\"2m,5m,5\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s\n",
-        ESCAPE(_("Alias")),
-        ESCAPE(_("Command")),
-        ESCAPE(_("Completion")));
+        ESCAPE_TABLE(_("Alias")),
+        ESCAPE_TABLE(_("Command")),
+        ESCAPE_TABLE(_("Completion")));
 
     ptr_infolist = hook_infolist_get (NULL, "alias_default", NULL, NULL);
     while (infolist_next (ptr_infolist))
@@ -624,10 +651,10 @@ doc_gen_user_default_aliases (const char *path, const char *lang)
         ptr_completion = infolist_string(ptr_infolist, "completion");
         string_fprintf (file,
                         "| /%s | /%s | %s\n",
-                        ESCAPE(infolist_string(ptr_infolist, "name")),
-                        ESCAPE(infolist_string(ptr_infolist, "command")),
+                        ESCAPE_TABLE(infolist_string(ptr_infolist, "name")),
+                        ESCAPE_TABLE(infolist_string(ptr_infolist, "command")),
                         (ptr_completion && ptr_completion[0]) ?
-                        ESCAPE(ptr_completion) : "-");
+                        ESCAPE_TABLE(ptr_completion) : "-");
     }
     infolist_free (ptr_infolist);
 
@@ -663,8 +690,8 @@ doc_gen_user_irc_colors (const char *path, const char *lang)
         "[width=\"50%\",cols=\"^2m,3\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s\n",
-        ESCAPE(_("IRC color")),
-        ESCAPE(_("WeeChat color")));
+        ESCAPE_TABLE(_("IRC color")),
+        ESCAPE_TABLE(_("WeeChat color")));
 
     ptr_infolist = hook_infolist_get (NULL, "irc_color_weechat", NULL, NULL);
     while (infolist_next (ptr_infolist))
@@ -672,8 +699,8 @@ doc_gen_user_irc_colors (const char *path, const char *lang)
         string_fprintf (
             file,
             "| %s | %s\n",
-            ESCAPE(infolist_string(ptr_infolist, "color_irc")),
-            ESCAPE(infolist_string(ptr_infolist, "color_weechat")));
+            ESCAPE_TABLE(infolist_string(ptr_infolist, "color_irc")),
+            ESCAPE_TABLE(infolist_string(ptr_infolist, "color_weechat")));
     }
     infolist_free (ptr_infolist);
 
@@ -737,10 +764,10 @@ doc_gen_api_infos (const char *path, const char *lang)
         "[width=\"100%\",cols=\"^1,^2,6,6\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s | %s\n",
-        ESCAPE(_("Plugin")),
-        ESCAPE(_("Name")),
-        ESCAPE(_("Description")),
-        ESCAPE(_("Arguments")));
+        ESCAPE_TABLE(_("Plugin")),
+        ESCAPE_TABLE(_("Name")),
+        ESCAPE_TABLE(_("Description")),
+        ESCAPE_TABLE(_("Arguments")));
 
     list_hooks = arraylist_new (64, 1, 0,
                                 &doc_gen_hook_info_cmp_cb, NULL,
@@ -758,10 +785,10 @@ doc_gen_api_infos (const char *path, const char *lang)
         string_fprintf (
             file,
             "| %s | %s | %s | %s\n",
-            ESCAPE(PLUGIN(ptr_hook->plugin)),
-            ESCAPE(HOOK_INFO(ptr_hook, info_name)),
-            ESCAPE(TRANS(HOOK_INFO(ptr_hook, description))),
-            ESCAPE(TRANS_DEF(HOOK_INFO(ptr_hook, args_description), "-")));
+            ESCAPE_TABLE(PLUGIN(ptr_hook->plugin)),
+            ESCAPE_TABLE(HOOK_INFO(ptr_hook, info_name)),
+            ESCAPE_TABLE(TRANS(HOOK_INFO(ptr_hook, description))),
+            ESCAPE_TABLE(TRANS_DEF(HOOK_INFO(ptr_hook, args_description), "-")));
     }
 
     arraylist_free (list_hooks);
@@ -826,11 +853,11 @@ doc_gen_api_infos_hashtable (const char *path, const char *lang)
         "[width=\"100%\",cols=\"^1,^2,6,6,8\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s | %s | %s\n",
-        ESCAPE(_("Plugin")),
-        ESCAPE(_("Name")),
-        ESCAPE(_("Description")),
-        ESCAPE(_("Hashtable (input)")),
-        ESCAPE(_("Hashtable (output)")));
+        ESCAPE_TABLE(_("Plugin")),
+        ESCAPE_TABLE(_("Name")),
+        ESCAPE_TABLE(_("Description")),
+        ESCAPE_TABLE(_("Hashtable (input)")),
+        ESCAPE_TABLE(_("Hashtable (output)")));
 
     list_hooks = arraylist_new (64, 1, 0,
                                 &doc_gen_hook_info_hashtable_cmp_cb, NULL,
@@ -848,10 +875,10 @@ doc_gen_api_infos_hashtable (const char *path, const char *lang)
         string_fprintf (
             file,
             "| %s | %s | %s | %s | %s\n",
-            ESCAPE(PLUGIN(ptr_hook->plugin)),
-            ESCAPE(HOOK_INFO(ptr_hook, info_name)),
-            ESCAPE(TRANS(HOOK_INFO_HASHTABLE(ptr_hook, description))),
-            ESCAPE(TRANS_DEF(HOOK_INFO_HASHTABLE(ptr_hook, args_description), "-")),
+            ESCAPE_TABLE(PLUGIN(ptr_hook->plugin)),
+            ESCAPE_TABLE(HOOK_INFO(ptr_hook, info_name)),
+            ESCAPE_TABLE(TRANS(HOOK_INFO_HASHTABLE(ptr_hook, description))),
+            ESCAPE_TABLE(TRANS_DEF(HOOK_INFO_HASHTABLE(ptr_hook, args_description), "-")),
             TRANS_DEF(HOOK_INFO_HASHTABLE(ptr_hook, output_description), "-"));
     }
 
@@ -917,11 +944,11 @@ doc_gen_api_infolists (const char *path, const char *lang)
         "[width=\"100%\",cols=\"^1,^2,5,5,5\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s | %s | %s\n",
-        ESCAPE(_("Plugin")),
-        ESCAPE(_("Name")),
-        ESCAPE(_("Description")),
-        ESCAPE(_("Pointer")),
-        ESCAPE(_("Arguments")));
+        ESCAPE_TABLE(_("Plugin")),
+        ESCAPE_TABLE(_("Name")),
+        ESCAPE_TABLE(_("Description")),
+        ESCAPE_TABLE(_("Pointer")),
+        ESCAPE_TABLE(_("Arguments")));
 
     list_hooks = arraylist_new (64, 1, 0,
                                 &doc_gen_hook_infolist_cmp_cb, NULL,
@@ -939,11 +966,11 @@ doc_gen_api_infolists (const char *path, const char *lang)
         string_fprintf (
             file,
             "| %s | %s | %s | %s | %s\n",
-            ESCAPE(PLUGIN(ptr_hook->plugin)),
-            ESCAPE(HOOK_INFOLIST(ptr_hook, infolist_name)),
-            ESCAPE(TRANS(HOOK_INFOLIST(ptr_hook, description))),
-            ESCAPE(TRANS_DEF(HOOK_INFOLIST(ptr_hook, pointer_description), "-")),
-            ESCAPE(TRANS_DEF(HOOK_INFOLIST(ptr_hook, args_description), "-")));
+            ESCAPE_TABLE(PLUGIN(ptr_hook->plugin)),
+            ESCAPE_TABLE(HOOK_INFOLIST(ptr_hook, infolist_name)),
+            ESCAPE_TABLE(TRANS(HOOK_INFOLIST(ptr_hook, description))),
+            ESCAPE_TABLE(TRANS_DEF(HOOK_INFOLIST(ptr_hook, pointer_description), "-")),
+            ESCAPE_TABLE(TRANS_DEF(HOOK_INFOLIST(ptr_hook, args_description), "-")));
     }
 
     arraylist_free (list_hooks);
@@ -1203,11 +1230,11 @@ doc_gen_api_hdata (const char *path, const char *lang)
         "[width=\"100%\",cols=\"^1,^2,2,2,5\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s | %s | %s\n\n",
-        ESCAPE(_("Plugin")),
-        ESCAPE(_("Name")),
-        ESCAPE(_("Description")),
-        ESCAPE(_("Lists")),
-        ESCAPE(_("Variables")));
+        ESCAPE_TABLE(_("Plugin")),
+        ESCAPE_TABLE(_("Name")),
+        ESCAPE_TABLE(_("Description")),
+        ESCAPE_TABLE(_("Lists")),
+        ESCAPE_TABLE(_("Variables")));
 
     list_hooks = arraylist_new (64, 1, 0,
                                 &doc_gen_hook_hdata_cmp_cb, NULL,
@@ -1227,15 +1254,15 @@ doc_gen_api_hdata (const char *path, const char *lang)
                   HOOK_HDATA(ptr_hook, hdata_name));
         string_fprintf (file,
                         "| %s\n",
-                        ESCAPE(PLUGIN(ptr_hook->plugin)));
+                        ESCAPE_TABLE(PLUGIN(ptr_hook->plugin)));
         string_fprintf (file,
                         "| [[%s]]<<%s,%s>>\n",
-                        ESCAPE(str_anchor),
-                        ESCAPE(str_anchor),
-                        ESCAPE(HOOK_HDATA(ptr_hook, hdata_name)));
+                        ESCAPE_TABLE(str_anchor),
+                        ESCAPE_TABLE(str_anchor),
+                        ESCAPE_TABLE(HOOK_HDATA(ptr_hook, hdata_name)));
         string_fprintf (file,
                         "| %s\n",
-                        ESCAPE(TRANS(HOOK_HDATA(ptr_hook, description))));
+                        ESCAPE_TABLE(TRANS(HOOK_HDATA(ptr_hook, description))));
         ptr_hdata = hook_hdata_get (NULL, HOOK_HDATA(ptr_hook, hdata_name));
         if (ptr_hdata)
             doc_gen_api_hdata_content (file, ptr_hdata);
@@ -1303,9 +1330,9 @@ doc_gen_api_completions (const char *path, const char *lang)
         "[width=\"100%\",cols=\"^1,^2,7\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s\n",
-        ESCAPE(_("Plugin")),
-        ESCAPE(_("Name")),
-        ESCAPE(_("Description")));
+        ESCAPE_TABLE(_("Plugin")),
+        ESCAPE_TABLE(_("Name")),
+        ESCAPE_TABLE(_("Description")));
 
     list_hooks = arraylist_new (64, 1, 0,
                                 &doc_gen_hook_completion_cmp_cb, NULL,
@@ -1323,9 +1350,9 @@ doc_gen_api_completions (const char *path, const char *lang)
         string_fprintf (
             file,
             "| %s | %s | %s\n",
-            ESCAPE(PLUGIN(ptr_hook->plugin)),
-            ESCAPE(HOOK_COMPLETION(ptr_hook, completion_item)),
-            ESCAPE(TRANS(HOOK_COMPLETION(ptr_hook, description))));
+            ESCAPE_TABLE(PLUGIN(ptr_hook->plugin)),
+            ESCAPE_TABLE(HOOK_COMPLETION(ptr_hook, completion_item)),
+            ESCAPE_TABLE(TRANS(HOOK_COMPLETION(ptr_hook, description))));
     }
 
     arraylist_free (list_hooks);
@@ -1363,9 +1390,9 @@ doc_gen_api_url_options (const char *path, const char *lang)
         "[width=\"100%\",cols=\"2,^1,7\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s ^(1)^ | %s ^(2)^\n",
-        ESCAPE(_("Option")),
-        ESCAPE(_("Type")),
-        ESCAPE(_("Constants")));
+        ESCAPE_TABLE(_("Option")),
+        ESCAPE_TABLE(_("Type")),
+        ESCAPE_TABLE(_("Constants")));
 
     for (i = 0; url_options[i].name; i++)
     {
@@ -1373,8 +1400,8 @@ doc_gen_api_url_options (const char *path, const char *lang)
         string_fprintf (
             file,
             "| %s | %s |",
-            ESCAPE(name),
-            ESCAPE(url_type_string[url_options[i].type]));
+            ESCAPE_TABLE(name),
+            ESCAPE_TABLE(url_type_string[url_options[i].type]));
         if (name)
             free (name);
         if (url_options[i].constants)
@@ -1450,9 +1477,9 @@ doc_gen_api_plugins_priority (const char *path, const char *lang)
         "[width=\"30%\",cols=\"1,3,2\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s\n",
-        ESCAPE(_("Rank")),
-        ESCAPE(_("Plugin")),
-        ESCAPE(_("Priority")));
+        ESCAPE_TABLE(_("Rank")),
+        ESCAPE_TABLE(_("Plugin")),
+        ESCAPE_TABLE(_("Priority")));
 
     list_plugins = arraylist_new (64, 1, 0,
                                   &doc_gen_plugin_cmp_cb, NULL,
@@ -1536,9 +1563,9 @@ doc_gen_api_config_priority (const char *path, const char *lang)
         "[width=\"30%\",cols=\"1,3,2\",options=\"header\"]\n"
         "|===\n"
         "| %s | %s | %s\n",
-        ESCAPE(_("Rank")),
-        ESCAPE(_("File")),
-        ESCAPE(_("Priority")));
+        ESCAPE_TABLE(_("Rank")),
+        ESCAPE_TABLE(_("File")),
+        ESCAPE_TABLE(_("Priority")));
 
     list_configs = arraylist_new (64, 1, 0,
                                   &doc_gen_config_cmp_cb, NULL,
@@ -1628,7 +1655,7 @@ doc_generate (const char *path)
     {
         string_fprintf (
             stderr,
-            "doc generator: ERROR: failed to create directory \"%s\")",
+            "doc generator: ERROR: failed to create directory \"%s\")\n",
             path);
         goto end;
     }
@@ -1638,14 +1665,26 @@ doc_generate (const char *path)
      * (this is used to generate documentation without installing WeeChat,
      * that means no need to run `make install`)
      */
+#ifdef ENABLE_NLS
     localedir = getenv ("WEECHAT_DOCGEN_LOCALEDIR");
     if (localedir && localedir[0])
         bindtextdomain (PACKAGE, localedir);
+#endif /* ENABLE_NLS */
 
     for (i = 0; locales[i]; i++)
     {
         setenv ("LANGUAGE", locales[i], 1);
-        setlocale (LC_ALL, locales[i]);
+        if (!setlocale (LC_ALL, locales[i]))
+        {
+            /* warning on missing locale */
+            string_fprintf (
+                stderr,
+                "doc generator: WARNING: failed to set locale \"%s\", "
+                "docs will include auto-generated English content\n",
+                locales[i]);
+            /* fallback to English */
+            setlocale (LC_ALL, "C");
+        }
         memcpy (lang, locales[i], 2);
         lang[2] = '\0';
         for (j = 0; doc_gen_functions[j]; j++)

src/core/wee-eval.c

@@ -413,6 +413,7 @@ eval_string_cut (const char *text, int screen)
     if (!tmp)
         return strdup ("");
 
+    error = NULL;
     number = strtol (tmp, &error, 10);
     if (!error || error[0] || (number < 0))
     {
@@ -453,6 +454,7 @@ eval_string_repeat (const char *text)
     if (!tmp)
         return strdup ("");
 
+    error = NULL;
     number = strtol (tmp, &error, 10);
     if (!error || error[0] || (number < 0))
     {
@@ -538,6 +540,7 @@ eval_string_split (const char *text)
     }
     else
     {
+        error = NULL;
         number = strtol (str_number, &error, 10);
         if (!error || error[0] || (number == 0))
             goto end;
@@ -578,6 +581,7 @@ eval_string_split (const char *text)
             }
             else if (strncmp (list_flags[i], "max_items=", 10) == 0)
             {
+                error = NULL;
                 max_items = strtol (list_flags[i] + 10, &error, 10);
                 if (!error || error[0] || (max_items < 0))
                     goto end;
@@ -686,6 +690,7 @@ eval_string_split_shell (const char *text)
     }
     else
     {
+        error = NULL;
         number = strtol (str_number, &error, 10);
         if (!error || error[0] || (number == 0))
             goto end;
@@ -766,6 +771,7 @@ eval_string_regex_group (const char *text, struct t_eval_context *eval_context)
     }
     else
     {
+        error = NULL;
         number = strtol (text, &error, 10);
         if (!error || error[0])
             number = -1;
@@ -897,6 +903,7 @@ eval_string_base_encode (const char *text)
     if (!base)
         goto end;
 
+    error = NULL;
     number = strtol (base, &error, 10);
     if (!error || error[0])
         goto end;
@@ -946,6 +953,7 @@ eval_string_base_decode (const char *text)
     if (!base)
         goto end;
 
+    error = NULL;
     number = strtol (base, &error, 10);
     if (!error || error[0])
         goto end;
@@ -1087,6 +1095,7 @@ eval_string_random (const char *text)
     tmp = string_strndup (text, pos - text);
     if (!tmp)
         goto error;
+    error = NULL;
     min_number = strtoll (tmp, &error, 10);
     if (!error || error[0])
     {
@@ -1095,6 +1104,7 @@ eval_string_random (const char *text)
     }
     free (tmp);
 
+    error = NULL;
     max_number = strtoll (pos + 1, &error, 10);
     if (!error || error[0])
         goto error;
@@ -2618,6 +2628,7 @@ eval_expression (const char *expr, struct t_hashtable *pointers,
         ptr_value = hashtable_get (options, "debug");
         if (ptr_value && ptr_value[0])
         {
+            error = NULL;
             number = strtol (ptr_value, &error, 10);
             if (error && !error[0] && (number >= 1))
             {

src/core/wee-string.c

@@ -1312,7 +1312,7 @@ string_convert_escaped_chars (const char *string)
 }
 
 /*
- * Checks if first char of string is a whitespace (space or tab).
+ * Checks if first char of string is a whitespace (space, tab, newline or carriage return).
  *
  * Returns:
  *   1: first char is whitespace
@@ -1322,7 +1322,11 @@ string_convert_escaped_chars (const char *string)
 int
 string_is_whitespace_char (const char *string)
 {
-    return (string && ((string[0] == ' ') || string[0] == '\t')) ? 1 : 0;
+    return (string && (
+            (string[0] == ' ')
+            || (string[0] == '\t')
+            || (string[0] == '\n')
+            || (string[0] == '\r'))) ? 1 : 0;
 }
 
 /*
@@ -3275,6 +3279,7 @@ string_parse_size (const char *size)
     if (!str_number)
         goto end;
 
+    error = NULL;
     number = strtoll (str_number, &error, 10);
     if (!error || error[0])
         goto end;

src/core/weechat.h

@@ -33,11 +33,7 @@
 #include <locale.h>
 
 #if defined(ENABLE_NLS) && !defined(_)
-    #ifdef HAVE_LIBINTL_H
-        #include <libintl.h>
-    #else
-        #include "../../intl/libintl.h"
-    #endif /* HAVE_LIBINTL_H */
+    #include <libintl.h>
     #define _(string) gettext(string)
     #define NG_(single,plural,number) ngettext(single,plural,number)
     #ifdef gettext_noop

src/gui/curses/gui-curses-key.c

@@ -134,7 +134,6 @@ gui_key_default_bindings (int context, int create_option)
         BIND("meta-h,meta-r",     "/hotlist restore");
         BIND("meta-h,meta-R",     "/hotlist restore -all");
         BIND("meta-k",            "/input grab_key_command");
-        BIND("meta-K",            "/input grab_raw_key_command");
         BIND("meta-s",            "/mute spell toggle");
         BIND("meta-u",            "/window scroll_unread");
         BIND("ctrl-s,ctrl-u",     "/allbuf /buffer set unread");
@@ -398,11 +397,13 @@ gui_key_flush (int paste)
              * code which is not UTF-8 valid)
              */
             if (!paste
+                && (i > gui_key_last_key_pressed_sent)
                 && (!gui_mouse_event_pending
                     || utf8_is_valid (key_str, -1, NULL)))
             {
                 (void) hook_signal_send ("key_pressed",
                                          WEECHAT_HOOK_SIGNAL_STRING, key_str);
+                gui_key_last_key_pressed_sent = i;
             }
 
             if (gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)

src/gui/gui-bar-item-custom.c

@@ -439,23 +439,46 @@ gui_bar_item_custom_new (const char *name, const char *conditions,
     if (gui_bar_item_custom_search (name))
         return NULL;
 
+    if (gui_bar_item_search_default (name) >= 0)
+        return NULL;
+
+    option_conditions = NULL;
+    option_content = NULL;
+    new_bar_item_custom = NULL;
+
     option_conditions = gui_bar_item_custom_create_option (
         name,
         GUI_BAR_ITEM_CUSTOM_OPTION_CONDITIONS,
         conditions);
+    if (!option_conditions)
+        goto error;
+
     option_content = gui_bar_item_custom_create_option (
         name,
         GUI_BAR_ITEM_CUSTOM_OPTION_CONTENT,
         content);
+    if (!option_content)
+        goto error;
 
     new_bar_item_custom = gui_bar_item_custom_new_with_options (
         name,
         option_conditions,
         option_content);
+    if (!new_bar_item_custom)
+        goto error;
+
+    gui_bar_item_custom_create_bar_item (new_bar_item_custom);
+    if (!new_bar_item_custom->bar_item)
+        goto error;
+
+    gui_bar_item_update (name);
+
+    return new_bar_item_custom;
+
+error:
     if (new_bar_item_custom)
     {
-        gui_bar_item_custom_create_bar_item (new_bar_item_custom);
-        gui_bar_item_update (name);
+        gui_bar_item_custom_free (new_bar_item_custom);
     }
     else
     {
@@ -464,8 +487,7 @@ gui_bar_item_custom_new (const char *name, const char *conditions,
         if (option_content)
             config_file_option_free (option_content, 0);
     }
-
-    return new_bar_item_custom;
+    return NULL;
 }
 
 /*
@@ -475,12 +497,13 @@ gui_bar_item_custom_new (const char *name, const char *conditions,
 void
 gui_bar_item_custom_use_temp_items ()
 {
-    struct t_gui_bar_item_custom *ptr_temp_item;
+    struct t_gui_bar_item_custom *ptr_temp_item, *ptr_next_temp_item;
     int i;
 
-    for (ptr_temp_item = gui_temp_custom_bar_items; ptr_temp_item;
-         ptr_temp_item = ptr_temp_item->next_item)
+    ptr_temp_item = gui_temp_custom_bar_items;
+    while (ptr_temp_item)
     {
+        ptr_next_temp_item = ptr_temp_item->next_item;
         for (i = 0; i < GUI_BAR_ITEM_CUSTOM_NUM_OPTIONS; i++)
         {
             if (!ptr_temp_item->options[i])
@@ -492,6 +515,20 @@ gui_bar_item_custom_use_temp_items ()
             }
         }
         gui_bar_item_custom_create_bar_item (ptr_temp_item);
+        if (!ptr_temp_item->bar_item)
+        {
+            if (ptr_temp_item->prev_item)
+                (ptr_temp_item->prev_item)->next_item = ptr_temp_item->next_item;
+            if (ptr_temp_item->next_item)
+                (ptr_temp_item->next_item)->prev_item = ptr_temp_item->prev_item;
+            if (gui_temp_custom_bar_items == ptr_temp_item)
+                gui_temp_custom_bar_items = ptr_temp_item->next_item;
+            if (last_gui_temp_custom_bar_item == ptr_temp_item)
+                last_gui_temp_custom_bar_item = ptr_temp_item->prev_item;
+            gui_bar_item_custom_free_data (ptr_temp_item);
+            free (ptr_temp_item);
+        }
+        ptr_temp_item = ptr_next_temp_item;
     }
 
     /* remove any existing custom bar item */
@@ -517,24 +554,72 @@ int
 gui_bar_item_custom_rename (struct t_gui_bar_item_custom *item,
                             const char *new_name)
 {
+    char *old_name, *option_name;
+    int i, length;
+
     if (!item || !gui_bar_item_custom_name_valid (new_name))
         return 0;
 
     if (gui_bar_item_custom_search (new_name))
         return 0;
 
+    if (gui_bar_item_search_default (new_name) >= 0)
+        return 0;
+
+    old_name = strdup (item->name);
+    if (!old_name)
+        return 0;
+
+    length = strlen (new_name) + 128;
+    option_name = malloc (length);
+    if (!option_name)
+    {
+        free (old_name);
+        return 0;
+    }
+
     free (item->bar_item->name);
     item->bar_item->name = strdup (new_name);
 
-    gui_bar_item_update (item->name);
-    gui_bar_item_update (item->bar_item->name);
-
     free (item->name);
     item->name = strdup (new_name);
 
+    for (i = 0; i < GUI_BAR_ITEM_CUSTOM_NUM_OPTIONS; i++)
+    {
+        snprintf (option_name, length,
+                  "%s.%s",
+                  new_name,
+                  gui_bar_item_custom_option_string[i]);
+        config_file_option_rename (item->options[i], option_name);
+    }
+
+    gui_bar_item_update (old_name);
+    gui_bar_item_update (item->name);
+
+    free (old_name);
+    free (option_name);
+
     return 1;
 }
 
+/*
+ * Frees data in a custom bar item.*
+ */
+
+void
+gui_bar_item_custom_free_data (struct t_gui_bar_item_custom *item)
+{
+    int i;
+
+    if (item->name)
+        free (item->name);
+    for (i = 0; i < GUI_BAR_ITEM_CUSTOM_NUM_OPTIONS; i++)
+    {
+        if (item->options[i])
+            config_file_option_free (item->options[i], 1);
+    }
+}
+
 /*
  * Deletes a custom bar item.
  */
@@ -543,7 +628,6 @@ void
 gui_bar_item_custom_free (struct t_gui_bar_item_custom *item)
 {
     char *name;
-    int i;
 
     if (!item)
         return;
@@ -564,13 +648,7 @@ gui_bar_item_custom_free (struct t_gui_bar_item_custom *item)
         last_gui_custom_bar_item = item->prev_item;
 
     /* free data */
-    if (item->name)
-        free (item->name);
-    for (i = 0; i < GUI_BAR_ITEM_CUSTOM_NUM_OPTIONS; i++)
-    {
-        if (item->options[i])
-            config_file_option_free (item->options[i], 1);
-    }
+    gui_bar_item_custom_free_data (item);
 
     free (item);
 

src/gui/gui-bar-item-custom.h

@@ -69,6 +69,7 @@ extern struct t_gui_bar_item_custom *gui_bar_item_custom_new (const char *name,
 extern void gui_bar_item_custom_use_temp_items ();
 extern int gui_bar_item_custom_rename (struct t_gui_bar_item_custom *item,
                                        const char *new_name);
+extern void gui_bar_item_custom_free_data (struct t_gui_bar_item_custom *item);
 extern void gui_bar_item_custom_free (struct t_gui_bar_item_custom *item);
 extern void gui_bar_item_custom_free_all ();
 

src/gui/gui-bar-item.c

@@ -97,6 +97,30 @@ gui_bar_item_valid (struct t_gui_bar_item *bar_item)
     return 0;
 }
 
+/*
+ * Searches for a default bar item by name.
+ *
+ * Returns index in gui_bar_item_names[], -1 if not found.
+ */
+
+int
+gui_bar_item_search_default (const char *item_name)
+{
+    int i;
+
+    if (!item_name || !item_name[0])
+        return -1;
+
+    for (i = 0; i < GUI_BAR_NUM_ITEMS; i++)
+    {
+        if (strcmp (gui_bar_item_names[i], item_name) == 0)
+            return i;
+    }
+
+    /* default bar item not found */
+    return -1;
+}
+
 /*
  * Searches for a bar item by name.
  */

src/gui/gui-bar-item.h

@@ -89,6 +89,7 @@ extern char *gui_bar_item_names[];
 /* functions */
 
 extern int gui_bar_item_valid (struct t_gui_bar_item *bar_item);
+extern int gui_bar_item_search_default (const char *item_name);
 extern struct t_gui_bar_item *gui_bar_item_search (const char *name);
 extern int gui_bar_item_used_in_bar (struct t_gui_bar *bar,
                                      const char *item_name,

src/gui/gui-buffer.c

@@ -2145,6 +2145,7 @@ gui_buffer_set_unread (struct t_gui_buffer *buffer, const char *argument)
     else if (argument[0] == '-')
     {
         /* move the unread marker N lines towards the first line */
+        error = NULL;
         number = strtol (argument, &error, 10);
         if (error && !error[0] && (number < 0))
         {
@@ -2172,6 +2173,7 @@ gui_buffer_set_unread (struct t_gui_buffer *buffer, const char *argument)
     else if (argument[0] == '+')
     {
         /* move the unread marker N lines towards the last line */
+        error = NULL;
         number = strtol (argument, &error, 10);
         if (error && !error[0] && (number > 0))
         {
@@ -2197,6 +2199,7 @@ gui_buffer_set_unread (struct t_gui_buffer *buffer, const char *argument)
     else
     {
         /* move the unread marker N lines from the end towards the first line */
+        error = NULL;
         number = strtol (argument, &error, 10);
         if (error && !error[0] && (number > 0))
         {
@@ -2885,6 +2888,7 @@ gui_buffer_search_by_number_or_name (const char *string)
 
     ptr_buffer = NULL;
 
+    error = NULL;
     number = strtol (string, &error, 10);
     if (error && !error[0])
     {

src/gui/gui-chat.c

@@ -597,6 +597,9 @@ gui_chat_printf_date_tags_internal (struct t_gui_buffer *buffer,
     char *modifier_data, *string, *new_string, *pos_newline;
     struct t_gui_line *new_line;
 
+    if (!buffer)
+        return;
+
     new_line = NULL;
     string = NULL;
     modifier_data = NULL;
@@ -862,7 +865,7 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
 {
     time_t date_printed;
     char *pos, *pos_end;
-    int one_line = 0;
+    int one_line;
 
     if (!message)
         return;
@@ -885,9 +888,11 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
     if (date <= 0)
         date = date_printed;
 
+    one_line = 0;
     pos = vbuffer;
     while (pos)
     {
+        pos_end = NULL;
         if (!buffer || !buffer->input_multiline)
         {
             /* display until next end of line */
@@ -911,9 +916,7 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
         }
 
         if (one_line)
-        {
             break;
-        }
 
         pos = (pos_end && pos_end[1]) ? pos_end + 1 : NULL;
     }
@@ -1076,6 +1079,7 @@ gui_chat_hsignal_quote_line_cb (const void *pointer, void *data,
         hashtable_get (hashtable, "_chat_line_date") : NULL;
     if (date)
     {
+        error = NULL;
         number = strtol (date, &error, 10);
         if (error && !error[0])
         {

src/gui/gui-filter.c

@@ -363,7 +363,7 @@ gui_filter_new (int enabled, const char *name, const char *buffer_name,
 {
     struct t_gui_filter *new_filter;
     regex_t *regex1, *regex2;
-    char *pos_tab, *regex_prefix, buf[512], str_error[512];
+    char *pos_tab, *regex_prefix, buf[512], str_error[1024];
     const char *ptr_start_regex, *pos_regex_message;
     int rc;
 

src/gui/gui-history.c

@@ -88,7 +88,7 @@ gui_history_buffer_add (struct t_gui_buffer *buffer, const char *string)
                     free (buffer->last_history->text);
                 free (buffer->last_history);
                 buffer->last_history = ptr_history;
-                buffer->num_history++;
+                buffer->num_history--;
             }
         }
     }

src/gui/gui-input.c

@@ -1142,7 +1142,7 @@ gui_input_delete_line (struct t_gui_buffer *buffer)
     end_of_line = (char *)utf8_end_of_line (start);
 
     size_deleted = end_of_line - beginning_of_line;
-    length_deleted = utf8_strnlen (start, size_deleted);
+    length_deleted = utf8_strnlen (beginning_of_line, size_deleted);
 
     memmove (beginning_of_line, end_of_line, strlen (end_of_line));
 
@@ -1729,11 +1729,10 @@ gui_input_history_global_next (struct t_gui_buffer *buffer)
  */
 
 void
-gui_input_grab_key (struct t_gui_buffer *buffer, int raw_key, int command,
-                    const char *delay)
+gui_input_grab_key (struct t_gui_buffer *buffer, int command, const char *delay)
 {
     if (buffer->input)
-        gui_key_grab_init (raw_key, command, delay);
+        gui_key_grab_init (command, delay);
 }
 
 /*

src/gui/gui-input.h

@@ -78,8 +78,8 @@ extern void gui_input_history_local_previous (struct t_gui_buffer *buffer);
 extern void gui_input_history_local_next (struct t_gui_buffer *buffer);
 extern void gui_input_history_global_previous (struct t_gui_buffer *buffer);
 extern void gui_input_history_global_next (struct t_gui_buffer *buffer);
-extern void gui_input_grab_key (struct t_gui_buffer *buffer, int raw_key,
-                                int command, const char *delay);
+extern void gui_input_grab_key (struct t_gui_buffer *buffer, int command,
+                                const char *delay);
 extern void gui_input_grab_mouse (struct t_gui_buffer *buffer, int area);
 extern void gui_input_insert (struct t_gui_buffer *buffer, const char *args);
 extern void gui_input_undo (struct t_gui_buffer *buffer);

src/gui/gui-key.c

@@ -75,8 +75,8 @@ char *gui_key_modifier_list[] =
 { "meta-", "ctrl-", "shift-", NULL };
 
 char *gui_key_alias_list[] =
-{ "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "f10", "f11",
-  "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20",
+{ "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", "f20",
+  "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9",
   "home", "insert", "delete", "end", "backspace", "pgup", "pgdn",
   "up", "down", "right", "left", "tab", "return", "comma", "space", NULL };
 
@@ -87,7 +87,6 @@ int gui_key_verbose = 0;            /* 1 to see some messages               */
 
 char gui_key_combo[1024];           /* buffer used for combos               */
 int gui_key_grab = 0;               /* 1 if grab mode enabled (alt-k)       */
-int gui_key_grab_raw = 0;           /* grab raw key code?                   */
 int gui_key_grab_count = 0;         /* number of keys pressed in grab mode  */
 int gui_key_grab_command = 0;       /* grab command bound to key?           */
 int gui_key_grab_delay = 0;         /* delay for grab (default is 500)      */
@@ -95,6 +94,7 @@ int gui_key_grab_delay = 0;         /* delay for grab (default is 500)      */
 int *gui_key_buffer = NULL;         /* input buffer (for paste detection)   */
 int gui_key_buffer_alloc = 0;       /* input buffer allocated size          */
 int gui_key_buffer_size = 0;        /* input buffer size in bytes           */
+int gui_key_last_key_pressed_sent = -1;
 
 int gui_key_paste_pending = 0;      /* 1 is big paste was detected and      */
                                     /* WeeChat is asking user what to do    */
@@ -185,13 +185,12 @@ gui_key_get_current_context ()
  */
 
 void
-gui_key_grab_init (int grab_raw_key, int grab_command, const char *delay)
+gui_key_grab_init (int grab_command, const char *delay)
 {
     long milliseconds;
     char *error;
 
     gui_key_grab = 1;
-    gui_key_grab_raw = grab_raw_key;
     gui_key_grab_count = 0;
     gui_key_grab_command = grab_command;
 
@@ -217,8 +216,7 @@ int
 gui_key_grab_end_timer_cb (const void *pointer, void *data, int remaining_calls)
 {
     char *key_name, *key_name_alias, *key_utf8;
-    const char *ptr_key_name;
-    struct t_gui_key *ptr_key;
+    struct t_gui_key *ptr_key_raw, *ptr_key;
     int rc;
 
     /* make C compiler happy */
@@ -264,23 +262,23 @@ gui_key_grab_end_timer_cb (const void *pointer, void *data, int remaining_calls)
             }
         }
 
-        ptr_key_name = (gui_key_grab_raw) ? key_name : key_name_alias;
-
         /* add expanded key to input buffer */
         if (gui_current_window->buffer->input)
         {
-            gui_input_insert_string (gui_current_window->buffer, ptr_key_name);
-            if (gui_key_grab_command)
+            ptr_key_raw = gui_key_search (gui_keys[GUI_KEY_CONTEXT_DEFAULT],
+                                          key_name);
+            ptr_key = gui_key_search (gui_keys[GUI_KEY_CONTEXT_DEFAULT],
+                                      key_name_alias);
+            gui_input_insert_string (gui_current_window->buffer,
+                                     (ptr_key_raw) ? key_name : key_name_alias);
+            /* add command bound to key (if found) */
+            if (gui_key_grab_command && (ptr_key_raw || ptr_key))
             {
-                /* add command bound to key (if found) */
-                ptr_key = gui_key_search (gui_keys[GUI_KEY_CONTEXT_DEFAULT],
-                                          ptr_key_name);
-                if (ptr_key)
-                {
-                    gui_input_insert_string (gui_current_window->buffer, " ");
-                    gui_input_insert_string (gui_current_window->buffer,
-                                             ptr_key->command);
-                }
+                gui_input_insert_string (gui_current_window->buffer, " ");
+                gui_input_insert_string (
+                    gui_current_window->buffer,
+                    (ptr_key_raw) ?
+                    ptr_key_raw->command : ptr_key->command);
             }
             gui_input_text_changed_modifier_and_signal (
                 gui_current_window->buffer,
@@ -2391,6 +2389,9 @@ gui_key_pressed (const char *key_str)
 
     rc_expand = gui_key_expand (gui_key_combo, &key_name, &key_name_alias);
 
+    if (!rc_expand)
+        goto end_no_input;
+
     ptr_key = NULL;
     exact_match = 0;
 
@@ -2693,6 +2694,7 @@ gui_key_buffer_reset ()
         gui_key_buffer_optimize ();
     }
     gui_key_paste_lines = 0;
+    gui_key_last_key_pressed_sent = -1;
 }
 
 /*

src/gui/gui-key.h

@@ -82,6 +82,7 @@ extern int gui_key_grab;
 extern int gui_key_grab_count;
 extern int *gui_key_buffer;
 extern int gui_key_buffer_size;
+extern int gui_key_last_key_pressed_sent;
 extern int gui_key_paste_pending;
 extern int gui_key_paste_bracketed;
 extern time_t gui_key_last_activity_time;
@@ -90,8 +91,7 @@ extern time_t gui_key_last_activity_time;
 
 extern void gui_key_init ();
 extern int gui_key_search_context (const char *context);
-extern void gui_key_grab_init (int grab_raw_key, int grab_command,
-                               const char *delay);
+extern void gui_key_grab_init (int grab_command, const char *delay);
 extern int gui_key_expand (const char *key,
                            char **key_name, char **key_name_alias);
 extern char *gui_key_legacy_to_alias (const char *key);

src/plugins/buflist/buflist-mouse.c

@@ -62,6 +62,7 @@ buflist_focus_cb (const void *pointer, void *data, struct t_hashtable *info)
     ptr_bar_item_line = weechat_hashtable_get (info, "_bar_item_line");
     if (!ptr_bar_item_line)
         goto end;
+    error = NULL;
     item_line = strtol (ptr_bar_item_line, &error, 10);
     if (!error || error[0])
         goto end;
@@ -250,9 +251,11 @@ buflist_hsignal_cb (const void *pointer, void *data, const char *signal,
         return WEECHAT_RC_OK;
     ptr_buffer = (struct t_gui_buffer *)value;
 
+    error = NULL;
     number = strtol (ptr_number, &error, 10);
     if (!error || error[0])
         return WEECHAT_RC_OK;
+    error = NULL;
     number2 = strtol (ptr_number2, &error, 10);
     if (!error || error[0])
         return WEECHAT_RC_OK;

src/plugins/guile/weechat-guile.c

@@ -876,7 +876,7 @@ weechat_guile_command_cb (const void *pointer, void *data,
             {
                 /* load guile script */
                 path_script = plugin_script_search_path (weechat_guile_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_guile_load ((path_script) ? path_script : ptr_name,
                                     NULL);
                 if (path_script)
@@ -1289,7 +1289,16 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     scm_install_gmp_memory_functions = 0;
 #endif /* defined(HAVE_GUILE_GMP_MEMORY_FUNCTIONS) && (SCM_MAJOR_VERSION < 3 || (SCM_MAJOR_VERSION == 3 && SCM_MINOR_VERSION == 0 && SCM_MICRO_VERSION < 8)) */
 
+#if defined(__MACH__) || SCM_MAJOR_VERSION < 3
+    /*
+     * on GNU/Hurd or if using Guile < 3, use scm_with_guile() instead of
+     * scm_init_guile() to prevent crash on exit
+     */
     scm_with_guile (&weechat_guile_init, NULL);
+#else
+    /* any other OS (not GNU/Hurd) or Guile >= 3.x */
+    scm_init_guile ();
+#endif
 
     guile_module_weechat = scm_c_define_module ("weechat",
                                                 &weechat_guile_api_module_init,

src/plugins/irc/irc-batch.c

@@ -110,7 +110,7 @@ irc_batch_add_to_list (struct t_irc_server *server, struct t_irc_batch *batch)
 struct t_irc_batch *
 irc_batch_start_batch (struct t_irc_server *server, const char *reference,
                        const char *parent_ref, const char *type,
-                       const char *parameters)
+                       const char *parameters, struct t_hashtable *tags)
 {
     struct t_irc_batch *ptr_batch;
 
@@ -130,6 +130,7 @@ irc_batch_start_batch (struct t_irc_server *server, const char *reference,
     ptr_batch->parent_ref = (parent_ref) ? strdup (parent_ref) : NULL;
     ptr_batch->type = strdup (type);
     ptr_batch->parameters = (parameters) ? strdup (parameters) : NULL;
+    ptr_batch->tags = (tags) ? weechat_hashtable_dup (tags) : NULL;
     ptr_batch->start_time = time (NULL);
     ptr_batch->messages = NULL;
     ptr_batch->end_received = 0;
@@ -188,6 +189,8 @@ irc_batch_free (struct t_irc_server *server, struct t_irc_batch *batch)
         free (batch->type);
     if (batch->parameters)
         free (batch->parameters);
+    if (batch->tags)
+        weechat_hashtable_free (batch->tags);
     if (batch->messages)
         weechat_string_dyn_free (batch->messages, 1);
 
@@ -226,7 +229,7 @@ irc_batch_process_messages (struct t_irc_server *server,
                             struct t_irc_batch *batch)
 {
     char **list_messages, *command, *channel, modifier_data[1024], *new_messages;
-    char *message;
+    char *message, *message2;
     int i, count_messages;
 
     if (!batch || !batch->messages)
@@ -261,8 +264,13 @@ irc_batch_process_messages (struct t_irc_server *server,
                 if (!message)
                     continue;
 
+                message2 = irc_tag_add_tags_to_message (message,
+                                                        batch->tags);
+                if (!message2)
+                    continue;
+
                 irc_message_parse (server,
-                                   message,
+                                   message2,
                                    NULL,   /* tags */
                                    NULL,   /* message_without_tags */
                                    NULL,   /* nick */
@@ -280,13 +288,13 @@ irc_batch_process_messages (struct t_irc_server *server,
                                    NULL);  /* pos_text */
 
                 /* add raw message */
-                irc_raw_print (server, IRC_RAW_FLAG_RECV, message);
+                irc_raw_print (server, IRC_RAW_FLAG_RECV, message2);
 
                 /* call receive callback, ignoring batch tags */
-                irc_protocol_recv_command (server, message, command, channel, 1);
+                irc_protocol_recv_command (server, message2, command, channel, 1);
 
-                if (message)
-                    free (message);
+                free (message);
+                free (message2);
                 if (command)
                     free (command);
                 if (channel)
@@ -562,6 +570,10 @@ irc_batch_print_log (struct t_irc_server *server)
         weechat_log_printf ("       parent_ref. . . . . : '%s'",  ptr_batch->parent_ref);
         weechat_log_printf ("       type. . . . . . . . : '%s'",  ptr_batch->type);
         weechat_log_printf ("       parameters. . . . . : '%s'",  ptr_batch->parameters);
+        weechat_log_printf ("       tags. . . . . . . . : 0x%lx (hashtable: '%s')",
+                            ptr_batch->tags,
+                            weechat_hashtable_get_string (ptr_batch->tags,
+                                                          "keys_values"));
         weechat_log_printf ("       start_time. . . . . : %lld",  (long long)ptr_batch->start_time);
         weechat_log_printf ("       message . . . . . . : 0x%lx ('%s')",
                             ptr_batch->messages,

src/plugins/irc/irc-batch.h

@@ -22,6 +22,7 @@
 
 #include <time.h>
 
+struct t_hashtable;
 struct t_irc_server;
 
 struct t_irc_batch
@@ -30,6 +31,7 @@ struct t_irc_batch
     char *parent_ref;                   /* ref of parent batch (optional)   */
     char *type;                         /* type                             */
     char *parameters;                   /* parameters                       */
+    struct t_hashtable *tags;           /* batch message tags               */
     time_t start_time;                  /* start time (to auto-purge if     */
                                         /* batch end is not received)       */
     char **messages;                    /* messages separated by '\n'       */
@@ -46,7 +48,8 @@ extern struct t_irc_batch *irc_batch_start_batch (struct t_irc_server *server,
                                                   const char *reference,
                                                   const char *parent_ref,
                                                   const char *type,
-                                                  const char *parameters);
+                                                  const char *parameters,
+                                                  struct t_hashtable *tags);
 extern int irc_batch_add_message (struct t_irc_server *server,
                                   const char *reference,
                                   const char *irc_message);

src/plugins/irc/irc-channel.c

@@ -462,7 +462,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
                 if (noswitch
                     || (!manual_join && !autojoin_join)
                     || (manual_join && !weechat_config_boolean (irc_config_look_buffer_switch_join))
-                    || (autojoin_join && !weechat_config_boolean (irc_config_look_buffer_switch_autojoin)))
+                    || (!manual_join && autojoin_join && !weechat_config_boolean (irc_config_look_buffer_switch_autojoin)))
                 {
                     switch_to_channel = 0;
                 }

src/plugins/irc/irc-command.c

@@ -385,6 +385,7 @@ irc_command_me_channel_message (struct t_irc_server *server,
             {
                 irc_input_user_message_display (
                     server,
+                    0,  /* date */
                     channel_name,
                     NULL,  /* address */
                     "privmsg",
@@ -1970,6 +1971,7 @@ IRC_COMMAND_CALLBACK(ctcp)
             {
                 irc_input_user_message_display (
                     ptr_server,
+                    0,  /* date */
                     ctcp_target,
                     NULL,  /* address */
                     "privmsg",
@@ -2905,11 +2907,13 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
             pos_keys++;
         }
         if (pos_keys[0])
+        {
             keys = weechat_string_split (pos_keys, ",", NULL,
                                          WEECHAT_STRING_SPLIT_STRIP_LEFT
                                          | WEECHAT_STRING_SPLIT_STRIP_RIGHT
                                          | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS,
                                          0, &num_keys);
+        }
     }
     else
         new_args = strdup (arguments);
@@ -3023,6 +3027,9 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
         }
         weechat_string_free_split (channels);
     }
+
+    if (keys)
+        weechat_string_free_split (keys);
 }
 
 /*
@@ -3735,6 +3742,7 @@ IRC_COMMAND_CALLBACK(msg)
                 {
                     irc_input_user_message_display (
                         ptr_server,
+                        0,  /* date */
                         ptr_channel->name,
                         NULL,  /* address */
                         "privmsg",
@@ -3755,6 +3763,7 @@ IRC_COMMAND_CALLBACK(msg)
             {
                 irc_input_user_message_display (
                     ptr_server,
+                    0,  /* date */
                     targets[i],
                     NULL,  /* address */
                     "privmsg",
@@ -3910,6 +3919,7 @@ IRC_COMMAND_CALLBACK(notice)
                 ptr_message = (const char *)weechat_arraylist_get (list_messages, i);
                 irc_input_user_message_display (
                     ptr_server,
+                    0,  /* date */
                     argv[arg_target],
                     NULL,  /* address */
                     "notice",
@@ -4439,6 +4449,7 @@ IRC_COMMAND_CALLBACK(query)
                 {
                     irc_input_user_message_display (
                         ptr_server,
+                        0,  /* date */
                         ptr_channel->name,
                         NULL,  /* address */
                         "privmsg",
@@ -7070,7 +7081,7 @@ irc_command_init ()
            "    /ignore add toto*@*.domain.com libera #weechat"),
         "list"
         " || add %(irc_channel_nicks_hosts) %(irc_servers) %(irc_channels) %-"
-        " || del -all|%(irc_ignores_numbers) %-",
+        " || del %(irc_ignores_numbers)|-all %-",
         &irc_command_ignore, NULL, NULL);
     weechat_hook_command (
         "info",

src/plugins/irc/irc-config.c

@@ -103,6 +103,7 @@ struct t_config_option *irc_config_look_notice_welcome_redirect = NULL;
 struct t_config_option *irc_config_look_notice_welcome_tags = NULL;
 struct t_config_option *irc_config_look_notify_tags_ison = NULL;
 struct t_config_option *irc_config_look_notify_tags_whois = NULL;
+struct t_config_option *irc_config_look_open_pv_buffer_echo_msg = NULL;
 struct t_config_option *irc_config_look_part_closes_buffer = NULL;
 struct t_config_option *irc_config_look_pv_buffer = NULL;
 struct t_config_option *irc_config_look_pv_tags = NULL;
@@ -3266,6 +3267,13 @@ irc_config_init ()
                "\"notify_highlight\""),
             NULL, 0, 0, "notify_message", NULL, 0,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+        irc_config_look_open_pv_buffer_echo_msg = weechat_config_new_option (
+            irc_config_file, irc_config_section_look,
+            "open_pv_buffer_echo_msg", "boolean",
+            N_("open a private buffer on self message when capability "
+               "echo-message is enabled"),
+            NULL, 0, 0, "on", NULL, 0,
+            NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
         irc_config_look_part_closes_buffer = weechat_config_new_option (
             irc_config_file, irc_config_section_look,
             "part_closes_buffer", "boolean",

src/plugins/irc/irc-config.h

@@ -139,6 +139,7 @@ extern struct t_config_option *irc_config_look_notice_welcome_redirect;
 extern struct t_config_option *irc_config_look_notice_welcome_tags;
 extern struct t_config_option *irc_config_look_notify_tags_ison;
 extern struct t_config_option *irc_config_look_notify_tags_whois;
+extern struct t_config_option *irc_config_look_open_pv_buffer_echo_msg;
 extern struct t_config_option *irc_config_look_part_closes_buffer;
 extern struct t_config_option *irc_config_look_pv_buffer;
 extern struct t_config_option *irc_config_look_pv_tags;

src/plugins/irc/irc-input.c

@@ -62,6 +62,7 @@
 
 void
 irc_input_user_message_display (struct t_irc_server *server,
+                                time_t date,
                                 const char *target,
                                 const char *address,
                                 const char *command,
@@ -162,7 +163,7 @@ irc_input_user_message_display (struct t_irc_server *server,
         {
             weechat_printf_date_tags (
                 ptr_buffer,
-                0,
+                date,
                 irc_protocol_tags (
                     server,
                     command,
@@ -189,7 +190,7 @@ irc_input_user_message_display (struct t_irc_server *server,
         {
             weechat_printf_date_tags (
                 ptr_buffer,
-                0,
+                date,
                 irc_protocol_tags (
                     server,
                     command,
@@ -211,7 +212,7 @@ irc_input_user_message_display (struct t_irc_server *server,
     {
         weechat_printf_date_tags (
             ptr_buffer,
-            0,
+            date,
             irc_protocol_tags (
                 server,
                 command,
@@ -235,7 +236,7 @@ irc_input_user_message_display (struct t_irc_server *server,
     {
         weechat_printf_date_tags (
             ptr_buffer,
-            0,
+            date,
             irc_protocol_tags (
                 server,
                 command,
@@ -267,7 +268,7 @@ irc_input_user_message_display (struct t_irc_server *server,
     {
         weechat_printf_date_tags (
             ptr_buffer,
-            0,
+            date,
             irc_protocol_tags (
                 server,
                 command,
@@ -333,6 +334,7 @@ irc_input_send_user_message (struct t_gui_buffer *buffer, int flags,
             {
                 irc_input_user_message_display (
                     ptr_server,
+                    0,  /* date */
                     ptr_channel->name,
                     NULL,  /* address */
                     "privmsg",

src/plugins/irc/irc-input.h

@@ -20,9 +20,12 @@
 #ifndef WEECHAT_PLUGIN_IRC_INPUT_H
 #define WEECHAT_PLUGIN_IRC_INPUT_H
 
+#include <time.h>
+
 struct t_gui_buffer;
 
 extern void irc_input_user_message_display (struct t_irc_server *server,
+                                            time_t date,
                                             const char *target,
                                             const char *address,
                                             const char *command,

src/plugins/irc/irc-message.c

@@ -529,6 +529,8 @@ irc_message_parse_to_hashtable (struct t_irc_server *server,
         free (arguments);
     if (text)
         free (text);
+    if (params)
+        weechat_string_free_split (params);
 
     return hashtable;
 }
@@ -623,6 +625,7 @@ irc_message_parse_cap_multiline_value (struct t_irc_server *server,
     ptr_value = (const char *)weechat_hashtable_get (values, "max-bytes");
     if (ptr_value)
     {
+        error = NULL;
         number = strtol (ptr_value, &error, 10);
         if (error && !error[0])
             server->multiline_max_bytes = number;
@@ -631,6 +634,7 @@ irc_message_parse_cap_multiline_value (struct t_irc_server *server,
     ptr_value = (const char *)weechat_hashtable_get (values, "max-lines");
     if (ptr_value)
     {
+        error = NULL;
         number = strtol (ptr_value, &error, 10);
         if (error && !error[0])
             server->multiline_max_lines = number;

src/plugins/irc/irc-protocol.c

@@ -341,6 +341,7 @@ irc_protocol_parse_time (const char *time)
             pos = strchr (time2, ',');
             if (pos)
                 pos[0] = '\0';
+            error = NULL;
             value = strtol (time2, &error, 10);
             if (error && !error[0] && (value >= 0))
                 time_value = (int)value;
@@ -688,7 +689,8 @@ IRC_PROTOCOL_CALLBACK(batch)
             params[0] + 1,  /* reference */
             weechat_hashtable_get (tags, "batch"),  /* parent ref */
             params[1],  /* type */
-            str_params);
+            str_params,
+            tags);
         if (str_params)
             free (str_params);
     }
@@ -2454,6 +2456,8 @@ IRC_PROTOCOL_CALLBACK(notice)
     struct t_irc_channel *ptr_channel;
     struct t_irc_nick *ptr_nick;
     int notify_private, is_channel, is_channel_orig, nick_is_me, display_host;
+    int cap_echo_message, msg_already_received;
+    time_t time_now;
     struct t_gui_buffer *ptr_buffer;
 
     IRC_PROTOCOL_MIN_PARAMS(2);
@@ -2479,8 +2483,23 @@ IRC_PROTOCOL_CALLBACK(notice)
 
     if (nick && (pos_args[0] == '\01'))
     {
-        irc_ctcp_display_reply_from_nick (server, date, tags, command, nick,
-                                          address, pos_args);
+        cap_echo_message = weechat_hashtable_has_key (server->cap_list,
+                                                      "echo-message");
+        msg_already_received = weechat_hashtable_has_key (
+            server->echo_msg_recv, irc_message);
+        if (!msg_already_received && cap_echo_message)
+        {
+            time_now = time (NULL);
+            weechat_hashtable_set (server->echo_msg_recv,
+                                   irc_message, &time_now);
+        }
+        if (!cap_echo_message || !msg_already_received)
+        {
+            irc_ctcp_display_reply_from_nick (server, date, tags, command, nick,
+                                              address, pos_args);
+        }
+        if (msg_already_received)
+            weechat_hashtable_remove (server->echo_msg_recv, irc_message);
     }
     else
     {
@@ -2488,8 +2507,11 @@ IRC_PROTOCOL_CALLBACK(notice)
         is_channel = irc_channel_is_channel (server, pos_target);
         is_channel_orig = is_channel;
         if (is_channel)
+        {
             channel = strdup (pos_target);
-        else if (weechat_config_boolean (irc_config_look_notice_welcome_redirect))
+        }
+        else if (weechat_config_boolean (irc_config_look_notice_welcome_redirect)
+                 && (irc_server_strcasecmp (server, server->nick, pos_target) == 0))
         {
             end_char = ' ';
             switch (pos_args[0])
@@ -2968,6 +2990,7 @@ IRC_PROTOCOL_CALLBACK(pong)
 
 void
 irc_protocol_privmsg_display_ctcp_send (struct t_irc_server *server,
+                                        time_t date,
                                         const char *target,
                                         const char *address,
                                         const char *arguments)
@@ -2978,7 +3001,7 @@ irc_protocol_privmsg_display_ctcp_send (struct t_irc_server *server,
     if (!arguments || !arguments[0])
         return;
 
-    pos_end = strchr (arguments + 1, '\01');
+    pos_end = strrchr (arguments + 1, '\01');
     if (!pos_end)
         return;
 
@@ -2993,6 +3016,7 @@ irc_protocol_privmsg_display_ctcp_send (struct t_irc_server *server,
 
     irc_input_user_message_display (
         server,
+        date,
         target,
         address,
         "privmsg",
@@ -3024,7 +3048,9 @@ IRC_PROTOCOL_CALLBACK(privmsg)
 {
     char *msg_args, *msg_args2, str_tags[1024], *str_color, *color;
     const char *pos_target, *remote_nick, *pv_tags;
-    int status_msg, is_channel, nick_is_me;
+    int status_msg, is_channel, nick_is_me, cap_echo_message;
+    int msg_already_received;
+    time_t time_now;
     struct t_irc_channel *ptr_channel;
     struct t_irc_nick *ptr_nick;
 
@@ -3052,6 +3078,9 @@ IRC_PROTOCOL_CALLBACK(privmsg)
         pos_target++;
     }
 
+    cap_echo_message = weechat_hashtable_has_key (server->cap_list,
+                                                  "echo-message");
+
     /* receiver is a channel ? */
     if (is_channel)
     {
@@ -3070,7 +3099,7 @@ IRC_PROTOCOL_CALLBACK(privmsg)
                 if (nick_is_me)
                 {
                     irc_protocol_privmsg_display_ctcp_send (
-                        server, params[0], address, msg_args);
+                        server, date, params[0], address, msg_args);
                 }
                 else
                 {
@@ -3175,16 +3204,26 @@ IRC_PROTOCOL_CALLBACK(privmsg)
         /* CTCP to user */
         if (msg_args[0] == '\01')
         {
-            if (nick_is_me)
+            msg_already_received = weechat_hashtable_has_key (
+                server->echo_msg_recv, irc_message);
+            if (!msg_already_received && cap_echo_message)
+            {
+                time_now = time (NULL);
+                weechat_hashtable_set (server->echo_msg_recv,
+                                       irc_message, &time_now);
+            }
+            if (nick_is_me && cap_echo_message && !msg_already_received)
             {
                 irc_protocol_privmsg_display_ctcp_send (
-                    server, remote_nick, address, msg_args);
+                    server, date, remote_nick, address, msg_args);
             }
             else
             {
                 irc_ctcp_recv (server, date, tags, command, NULL, params[0],
                                address, nick, remote_nick, msg_args, irc_message);
             }
+            if (msg_already_received)
+                weechat_hashtable_remove (server->echo_msg_recv, irc_message);
             goto end;
         }
 
@@ -3194,7 +3233,8 @@ IRC_PROTOCOL_CALLBACK(privmsg)
             if (strcmp (ptr_channel->name, remote_nick) != 0)
                 irc_channel_pv_rename (server, ptr_channel, remote_nick);
         }
-        else
+        else if (!nick_is_me || !cap_echo_message
+                 || weechat_config_boolean (irc_config_look_open_pv_buffer_echo_msg))
         {
             ptr_channel = irc_channel_new (server,
                                            IRC_CHANNEL_TYPE_PRIVATE,
@@ -3210,13 +3250,21 @@ IRC_PROTOCOL_CALLBACK(privmsg)
             }
         }
 
-        if (weechat_config_boolean (irc_config_look_typing_status_nicks))
+        if (ptr_channel
+            && weechat_config_boolean (irc_config_look_typing_status_nicks))
         {
             irc_typing_channel_set_nick (ptr_channel, nick,
                                          IRC_CHANNEL_TYPING_STATE_OFF);
         }
 
-        irc_channel_set_topic (ptr_channel, address);
+        if (ptr_channel
+            && (!nick_is_me
+                || !cap_echo_message
+                || (irc_server_strcasecmp (server,
+                                           server->nick, remote_nick) == 0)))
+        {
+            irc_channel_set_topic (ptr_channel, address);
+        }
 
         if (nick_is_me)
         {
@@ -3259,20 +3307,35 @@ IRC_PROTOCOL_CALLBACK(privmsg)
             free (str_color);
         msg_args2 = (nick_is_me) ?
             irc_message_hide_password (server, remote_nick, msg_args) : NULL;
-        weechat_printf_date_tags (
-            ptr_channel->buffer,
-            date,
-            irc_protocol_tags (server, command, tags, str_tags, nick, address),
-            "%s%s",
-            irc_nick_as_prefix (
-                server, NULL, nick,
-                (nick_is_me) ?
-                IRC_COLOR_CHAT_NICK_SELF : irc_nick_color_for_pv (ptr_channel, nick)),
-            (msg_args2) ? msg_args2 : msg_args);
+        if (nick_is_me && !ptr_channel)
+        {
+            irc_input_user_message_display (
+                server,
+                date,
+                remote_nick,
+                address,
+                "privmsg",
+                NULL,  /* ctcp_type */
+                (msg_args2) ? msg_args2 : msg_args,
+                1);  /* decode_colors */
+        }
+        else
+        {
+            weechat_printf_date_tags (
+                ptr_channel->buffer,
+                date,
+                irc_protocol_tags (server, command, tags, str_tags, nick, address),
+                "%s%s",
+                irc_nick_as_prefix (
+                    server, NULL, nick,
+                    (nick_is_me) ?
+                    IRC_COLOR_CHAT_NICK_SELF : irc_nick_color_for_pv (ptr_channel, nick)),
+                (msg_args2) ? msg_args2 : msg_args);
+        }
         if (msg_args2)
             free (msg_args2);
 
-        if (ptr_channel->has_quit_server)
+        if (ptr_channel && ptr_channel->has_quit_server)
             ptr_channel->has_quit_server = 0;
 
         (void) weechat_hook_signal_send ("irc_pv",
@@ -6212,7 +6275,7 @@ IRC_PROTOCOL_CALLBACK(353)
             free (prefixes);
     }
 
-    if (!ptr_channel)
+    if (!ptr_channel && str_nicks)
     {
         weechat_printf_date_tags (
             irc_msgbuffer_get_target_buffer (
@@ -7781,7 +7844,8 @@ irc_protocol_recv_command (struct t_irc_server *server,
         IRCB(331, 1, 0, 331),            /* no topic for channel            */
         IRCB(332, 0, 1, 332),            /* topic of channel                */
         IRCB(333, 1, 0, 333),            /* topic info (nick/date)          */
-        IRCB(335, 1, 0, whois_nick_msg), /* is a bot on                     */
+        IRCB(335, 1, 0, whois_nick_msg), /* whois (is a bot on)             */
+        IRCB(337, 1, 0, whois_nick_msg), /* whois (is hiding idle time)     */
         IRCB(338, 1, 0, 338),            /* whois (host)                    */
         IRCB(341, 1, 0, 341),            /* inviting                        */
         IRCB(343, 1, 0, 330_343),        /* is opered as                    */

src/plugins/irc/irc-redirect.c

@@ -55,7 +55,7 @@ struct t_irc_redirect_pattern irc_redirect_patterns_default[] =
        *        stop: 323: end of /list
        *       extra: -
        */
-      "321",
+      "321,322",
       "323",
       NULL,
       NULL, NULL,
@@ -462,6 +462,7 @@ irc_redirect_new_with_commands (struct t_irc_server *server,
                     if (pos)
                     {
                         pos[0] = '\0';
+                        error = NULL;
                         value = strtol (pos + 1, &error, 10);
                         if (!error || error[0])
                             value = -1;
@@ -1309,6 +1310,7 @@ irc_redirect_pattern_hsignal_cb (const void *pointer, void *data,
     timeout = 0;
     if (str_timeout && str_timeout[0])
     {
+        error = NULL;
         number = (int)strtol (str_timeout, &error, 10);
         if (error && !error[0])
             timeout = number;
@@ -1379,6 +1381,7 @@ irc_redirect_command_hsignal_cb (const void *pointer, void *data,
     count = 1;
     if (str_count && str_count[0])
     {
+        error = NULL;
         number = (int)strtol (str_count, &error, 10);
         if (error && !error[0])
             count = number;
@@ -1387,6 +1390,7 @@ irc_redirect_command_hsignal_cb (const void *pointer, void *data,
     timeout = 0;
     if (str_timeout && str_timeout[0])
     {
+        error = NULL;
         number = (int)strtol (str_timeout, &error, 10);
         if (error && !error[0])
             timeout = number;

src/plugins/irc/irc-server.c

@@ -131,6 +131,8 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] =
 
 char *irc_server_casemapping_string[IRC_SERVER_NUM_CASEMAPPING] =
 { "rfc1459", "strict-rfc1459", "ascii" };
+int irc_server_casemapping_range[IRC_SERVER_NUM_CASEMAPPING] =
+{ 30, 29, 26 };
 
 char *irc_server_utf8mapping_string[IRC_SERVER_NUM_UTF8MAPPING] =
 { "none", "rfc8265" };
@@ -294,25 +296,15 @@ int
 irc_server_strcasecmp (struct t_irc_server *server,
                        const char *string1, const char *string2)
 {
-    int casemapping, rc;
+    int casemapping, range;
 
-    casemapping = (server) ? server->casemapping : IRC_SERVER_CASEMAPPING_RFC1459;
-    switch (casemapping)
-    {
-        case IRC_SERVER_CASEMAPPING_RFC1459:
-            rc = weechat_strcasecmp_range (string1, string2, 30);
-            break;
-        case IRC_SERVER_CASEMAPPING_STRICT_RFC1459:
-            rc = weechat_strcasecmp_range (string1, string2, 29);
-            break;
-        case IRC_SERVER_CASEMAPPING_ASCII:
-            rc = weechat_strcasecmp (string1, string2);
-            break;
-        default:
-            rc = weechat_strcasecmp_range (string1, string2, 30);
-            break;
-    }
-    return rc;
+    casemapping = (server) ? server->casemapping : -1;
+    if ((casemapping < 0) || (casemapping >= IRC_SERVER_NUM_CASEMAPPING))
+        casemapping = IRC_SERVER_CASEMAPPING_RFC1459;
+
+    range = irc_server_casemapping_range[casemapping];
+
+    return weechat_strcasecmp_range (string1, string2, range);
 }
 
 /*
@@ -329,25 +321,15 @@ int
 irc_server_strncasecmp (struct t_irc_server *server,
                         const char *string1, const char *string2, int max)
 {
-    int casemapping, rc;
+    int casemapping, range;
 
-    casemapping = (server) ? server->casemapping : IRC_SERVER_CASEMAPPING_RFC1459;
-    switch (casemapping)
-    {
-        case IRC_SERVER_CASEMAPPING_RFC1459:
-            rc = weechat_strncasecmp_range (string1, string2, max, 30);
-            break;
-        case IRC_SERVER_CASEMAPPING_STRICT_RFC1459:
-            rc = weechat_strncasecmp_range (string1, string2, max, 29);
-            break;
-        case IRC_SERVER_CASEMAPPING_ASCII:
-            rc = weechat_strncasecmp (string1, string2, max);
-            break;
-        default:
-            rc = weechat_strncasecmp_range (string1, string2, max, 30);
-            break;
-    }
-    return rc;
+    casemapping = (server) ? server->casemapping : -1;
+    if ((casemapping < 0) || (casemapping >= IRC_SERVER_NUM_CASEMAPPING))
+        casemapping = IRC_SERVER_CASEMAPPING_RFC1459;
+
+    range = irc_server_casemapping_range[casemapping];
+
+    return weechat_strncasecmp_range (string1, string2, max, range);
 }
 
 /*
@@ -418,6 +400,9 @@ irc_server_eval_fingerprint (struct t_irc_server *server)
     char *fingerprint_eval, **fingerprints, *str_sizes;
     int i, j, rc, algo, length;
 
+    if (!server)
+        return NULL;
+
     ptr_fingerprint = IRC_SERVER_OPTION_STRING(server,
                                                IRC_SERVER_OPTION_TLS_FINGERPRINT);
 
@@ -1611,6 +1596,25 @@ irc_server_buffer_set_input_multiline (struct t_irc_server *server,
     }
 }
 
+/*
+ * Checks if a server has channels opened.
+ */
+
+int
+irc_server_has_channels (struct t_irc_server *server)
+{
+    struct t_irc_channel *ptr_channel;
+
+    for (ptr_channel = server->channels; ptr_channel;
+         ptr_channel = ptr_channel->next_channel)
+    {
+        if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
+            return 1;
+    }
+
+    return 0;
+}
+
 /*
  * Allocates a new server and adds it to the servers queue.
  *
@@ -1768,6 +1772,11 @@ irc_server_alloc (const char *name)
         WEECHAT_HASHTABLE_STRING,
         WEECHAT_HASHTABLE_TIME,
         NULL, NULL);
+    new_server->echo_msg_recv = weechat_hashtable_new (
+        32,
+        WEECHAT_HASHTABLE_STRING,
+        WEECHAT_HASHTABLE_TIME,
+        NULL, NULL);
     new_server->batches = NULL;
     new_server->last_batch = NULL;
     new_server->buffer = NULL;
@@ -2254,6 +2263,7 @@ irc_server_free_data (struct t_irc_server *server)
     weechat_hashtable_free (server->join_manual);
     weechat_hashtable_free (server->join_channel_key);
     weechat_hashtable_free (server->join_noswitch);
+    weechat_hashtable_free (server->echo_msg_recv);
 
     /* free server data */
     for (i = 0; i < IRC_SERVER_NUM_OPTIONS; i++)
@@ -2808,11 +2818,10 @@ irc_server_outqueue_send (struct t_irc_server *server)
                               '\r');
                 if (pos)
                     pos[0] = '\0';
+
                 irc_raw_print (server, IRC_RAW_FLAG_SEND |
                                ((server->outqueue[priority]->modified) ? IRC_RAW_FLAG_MODIFIED : 0),
                                server->outqueue[priority]->message_after_mod);
-                if (pos)
-                    pos[0] = '\r';
 
                 /* send signal with command that will be sent to server */
                 (void) irc_server_send_signal (
@@ -2830,6 +2839,9 @@ irc_server_outqueue_send (struct t_irc_server *server)
                 if (tags_to_send)
                     free (tags_to_send);
 
+                if (pos)
+                    pos[0] = '\r';
+
                 /* send command */
                 irc_server_send (
                     server, server->outqueue[priority]->message_after_mod,
@@ -3914,6 +3926,23 @@ irc_server_check_join_smart_filtered_cb (void *data,
     }
 }
 
+/*
+ * Callback called for each message received with echo-message: deletes old
+ * messages in the hashtable.
+ */
+
+void
+irc_server_check_echo_msg_recv_cb (void *data,
+                                   struct t_hashtable *hashtable,
+                                   const void *key, const void *value)
+{
+    /* make C compiler happy */
+    (void) data;
+
+    if (*((time_t *)value) + (60 * 5) < time (NULL))
+        weechat_hashtable_remove (hashtable, key);
+}
+
 /*
  * Timer called each second to perform some operations on servers.
  */
@@ -4094,6 +4123,9 @@ irc_server_timer_cb (const void *pointer, void *data, int remaining_calls)
                                                NULL);
                     }
                 }
+                weechat_hashtable_map (ptr_server->echo_msg_recv,
+                                       &irc_server_check_echo_msg_recv_cb,
+                                       NULL);
                 ptr_batch = ptr_server->batches;
                 while (ptr_batch)
                 {
@@ -4196,6 +4228,9 @@ irc_server_close_connection (struct t_irc_server *server)
     /* remove all keys for joins without switch */
     weechat_hashtable_remove_all (server->join_noswitch);
 
+    /* remove all messages stored (with capability echo-message) */
+    weechat_hashtable_remove_all (server->echo_msg_recv);
+
     /* remove all batched events pending */
     irc_batch_free_all (server);
 
@@ -5832,7 +5867,7 @@ irc_server_autojoin_create_buffers (struct t_irc_server *server)
      * buffers are opened only if auto-join was not already done
      * and if no channels are currently opened
      */
-    if (server->autojoin_done || server->channels)
+    if (server->autojoin_done || irc_server_has_channels (server))
         return;
 
     /* evaluate server option "autojoin" */
@@ -5993,7 +6028,7 @@ irc_server_autojoin_channels (struct t_irc_server *server)
         return;
     }
 
-    if (!server->autojoin_done && !server->channels)
+    if (!server->autojoin_done && !irc_server_has_channels (server))
     {
         /* auto-join when connecting to server for first time */
         autojoin = irc_server_eval_expression (
@@ -6007,7 +6042,7 @@ irc_server_autojoin_channels (struct t_irc_server *server)
         if (autojoin)
             free (autojoin);
     }
-    else if (server->channels)
+    else if (irc_server_has_channels (server))
     {
         /* auto-join after disconnection (only rejoins opened channels) */
         autojoin = irc_server_build_autojoin (server);
@@ -6476,6 +6511,7 @@ irc_server_hdata_server_cb (const void *pointer, void *data,
         WEECHAT_HDATA_VAR(struct t_irc_server, join_manual, HASHTABLE, 0, NULL, NULL);
         WEECHAT_HDATA_VAR(struct t_irc_server, join_channel_key, HASHTABLE, 0, NULL, NULL);
         WEECHAT_HDATA_VAR(struct t_irc_server, join_noswitch, HASHTABLE, 0, NULL, NULL);
+        WEECHAT_HDATA_VAR(struct t_irc_server, echo_msg_recv, HASHTABLE, 0, NULL, NULL);
         WEECHAT_HDATA_VAR(struct t_irc_server, batches, POINTER, 0, NULL, "irc_batch");
         WEECHAT_HDATA_VAR(struct t_irc_server, last_batch, POINTER, 0, NULL, "irc_batch");
         WEECHAT_HDATA_VAR(struct t_irc_server, buffer, POINTER, 0, NULL, "buffer");
@@ -7265,6 +7301,9 @@ irc_server_print_log ()
         weechat_log_printf ("  join_noswitch . . . . . . : 0x%lx (hashtable: '%s')",
                             ptr_server->join_noswitch,
                             weechat_hashtable_get_string (ptr_server->join_noswitch, "keys_values"));
+        weechat_log_printf ("  echo_msg_recv . . . . . . : 0x%lx (hashtable: '%s')",
+                            ptr_server->echo_msg_recv,
+                            weechat_hashtable_get_string (ptr_server->echo_msg_recv, "keys_values"));
         weechat_log_printf ("  batches . . . . . . . . . : 0x%lx", ptr_server->batches);
         weechat_log_printf ("  last_batch. . . . . . . . : 0x%lx", ptr_server->last_batch);
         weechat_log_printf ("  buffer. . . . . . . . . . : 0x%lx", ptr_server->buffer);

src/plugins/irc/irc-server.h

@@ -289,6 +289,7 @@ struct t_irc_server
     struct t_hashtable *join_manual;         /* manual joins pending         */
     struct t_hashtable *join_channel_key;    /* keys pending for joins       */
     struct t_hashtable *join_noswitch;       /* joins w/o switch to buffer   */
+    struct t_hashtable *echo_msg_recv;    /* msg received with echo-message  */
     struct t_irc_batch *batches;          /* batched events (cap "batch")    */
     struct t_irc_batch *last_batch;       /* last batch                      */
     struct t_gui_buffer *buffer;          /* GUI buffer allocated for server */
@@ -386,6 +387,7 @@ extern char *irc_server_get_default_msg (const char *default_msg,
                                          const char *target_nick);
 extern void irc_server_buffer_set_input_multiline (struct t_irc_server *server,
                                                    int multiline);
+extern int irc_server_has_channels (struct t_irc_server *server);
 extern struct t_irc_server *irc_server_alloc (const char *name);
 extern struct t_irc_server *irc_server_alloc_with_url (const char *irc_url);
 extern void irc_server_apply_command_line_options (struct t_irc_server *server,

src/plugins/irc/irc-tag.c

@@ -283,3 +283,159 @@ irc_tag_parse (const char *tags,
 
     return num_tags;
 }
+
+/*
+ * Adds tags to a dynamic string, separated by semicolons, with escaped
+ * tag values.
+ */
+
+void
+irc_tag_add_to_string_cb (void *data,
+                          struct t_hashtable *hashtable,
+                          const void *key,
+                          const void *value)
+{
+    char **string, *escaped;
+
+    /* make C compiler happy */
+    (void) hashtable;
+
+    string = (char **)data;
+
+    if (*string[0])
+        weechat_string_dyn_concat (string, ";", -1);
+
+    weechat_string_dyn_concat (string, key, -1);
+
+    if (value)
+    {
+        weechat_string_dyn_concat (string, "=", -1);
+        escaped = irc_tag_escape_value ((const char *)value);
+        weechat_string_dyn_concat (string,
+                                   (escaped) ? escaped : (const char *)value,
+                                   -1);
+        if (escaped)
+            free (escaped);
+    }
+}
+
+/*
+ * Converts hashtable with tags to a string (tags and values are escaped).
+ *
+ * Note: result must be freed after use.
+ */
+
+char *
+irc_tag_hashtable_to_string (struct t_hashtable *tags)
+{
+    char **string;
+
+    if (!tags)
+        return NULL;
+
+    string = weechat_string_dyn_alloc (64);
+    if (!string)
+        return NULL;
+
+    weechat_hashtable_map (tags, &irc_tag_add_to_string_cb, string);
+
+    return weechat_string_dyn_free (string, 0);
+}
+
+/*
+ * Adds tags to another hashtable.
+ */
+
+void
+irc_tag_add_to_hashtable_cb (void *data,
+                             struct t_hashtable *hashtable,
+                             const void *key,
+                             const void *value)
+{
+    /* make C compiler happy */
+    (void) hashtable;
+
+    if (!weechat_hashtable_has_key ((struct t_hashtable *)data, key))
+        weechat_hashtable_set ((struct t_hashtable *)data, key, value);
+}
+
+/*
+ * Adds tags to an IRC message.
+ * Existing tags in message are kept unchanged.
+ *
+ * Note: result must be freed after use.
+ */
+
+char *
+irc_tag_add_tags_to_message (const char *message, struct t_hashtable *tags)
+{
+    char *msg_str_tags, **result, *new_tags;
+    const char *pos_space, *ptr_message;
+    struct t_hashtable *msg_hash_tags;
+
+    if (!message)
+        return NULL;
+
+    if (!tags)
+        return strdup (message);
+
+    result = NULL;
+    msg_str_tags = NULL;
+    msg_hash_tags = NULL;
+    new_tags = NULL;
+
+    if (message[0] == '@')
+    {
+        pos_space = strchr (message, ' ');
+        if (!pos_space)
+            goto end;
+        msg_str_tags = weechat_strndup (message + 1, pos_space - message - 1);
+        ptr_message = pos_space + 1;
+        while (ptr_message[0] == ' ')
+        {
+            ptr_message++;
+        }
+    }
+    else
+    {
+        ptr_message = message;
+    }
+
+    msg_hash_tags = weechat_hashtable_new (32,
+                                           WEECHAT_HASHTABLE_STRING,
+                                           WEECHAT_HASHTABLE_STRING,
+                                           NULL, NULL);
+    if (!msg_hash_tags)
+        goto end;
+
+    if (msg_str_tags)
+        irc_tag_parse (msg_str_tags, msg_hash_tags, NULL);
+
+    weechat_hashtable_map (tags, &irc_tag_add_to_hashtable_cb, msg_hash_tags);
+
+    result = weechat_string_dyn_alloc (64);
+    if (!result)
+        goto end;
+
+    new_tags = irc_tag_hashtable_to_string (msg_hash_tags);
+    if (!new_tags)
+        goto end;
+
+    if (new_tags[0])
+    {
+        weechat_string_dyn_concat (result, "@", -1);
+        weechat_string_dyn_concat (result, new_tags, -1);
+        weechat_string_dyn_concat (result, " ", -1);
+    }
+    weechat_string_dyn_concat (result, ptr_message, -1);
+
+end:
+    if (msg_str_tags)
+        free (msg_str_tags);
+    if (msg_hash_tags)
+        weechat_hashtable_free (msg_hash_tags);
+    if (new_tags)
+        free (new_tags);
+
+    return (result) ? weechat_string_dyn_free (result, 0) : NULL;
+}

src/plugins/irc/irc-tag.h

@@ -30,5 +30,7 @@ extern char *irc_tag_modifier_cb (const void *pointer,
 extern int irc_tag_parse (const char *tags,
                           struct t_hashtable *hashtable,
                           const char *prefix_key);
+extern char *irc_tag_add_tags_to_message (const char *message,
+                                          struct t_hashtable *tags);
 
 #endif /* WEECHAT_PLUGIN_IRC_TAG_H */

src/plugins/irc/irc.c

@@ -149,6 +149,8 @@ irc_signal_upgrade_cb (const void *pointer, void *data,
                       "work for servers connected via TLS"),
                     weechat_prefix ("error"), IRC_PLUGIN_NAME);
             }
+            /* send QUIT to server, then disconnect */
+            irc_command_quit_server (ptr_server, NULL);
             irc_server_disconnect (ptr_server, 0, 0);
             /*
              * schedule reconnection: WeeChat will reconnect to this server

src/plugins/javascript/weechat-js.cpp

@@ -657,7 +657,7 @@ weechat_js_command_cb (const void *pointer, void *data,
             {
                 /* load javascript script */
                 path_script = plugin_script_search_path (weechat_js_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_js_load ((path_script) ? path_script : ptr_name,
                                  NULL);
                 if (path_script)

src/plugins/logger/logger-backlog.c

@@ -168,7 +168,7 @@ struct t_arraylist *
 logger_backlog_group_messages (struct t_arraylist *lines)
 {
     int i, size, time_found;
-    char **message, **old_message, *str_date, *error;
+    char *message, *new_message, *str_date, *error;
     const char *ptr_line, *pos_message;
     struct tm tm_line;
     struct t_arraylist *messages;
@@ -176,27 +176,37 @@ logger_backlog_group_messages (struct t_arraylist *lines)
     if (!lines)
         return NULL;
 
+    message = NULL;
+
     size = weechat_arraylist_size (lines);
 
     messages = weechat_arraylist_new (size, 0, 1,
                                       &logger_backlog_msg_cmp_cb, NULL,
                                       &logger_backlog_msg_free_cb, NULL);
     if (!messages)
-        return NULL;
-
-    message = weechat_string_dyn_alloc (256);
-    old_message = weechat_string_dyn_alloc (256);
+        goto error;
 
     for (i = size - 1; i >= 0; i--)
     {
         ptr_line = (const char *)weechat_arraylist_get (lines, i);
 
-        weechat_string_dyn_copy (old_message, *message);
-        weechat_string_dyn_copy (message, ptr_line);
-        if ((*old_message)[0])
+        if (message)
         {
-            weechat_string_dyn_concat (message, "\n", -1);
-            weechat_string_dyn_concat (message, *old_message, -1);
+            new_message = malloc (strlen (ptr_line) + 1 + strlen (message) + 1);
+            if (!new_message)
+                goto error;
+            strcpy (new_message, ptr_line);
+            strcat (new_message, "\n");
+            strcat (new_message, message);
+            free (message);
+            message = new_message;
+        }
+        else
+        {
+            message = malloc (strlen (ptr_line) + 1);
+            if (!message)
+                goto error;
+            strcpy (message, ptr_line);
         }
 
         time_found = 0;
@@ -218,18 +228,26 @@ logger_backlog_group_messages (struct t_arraylist *lines)
         }
         if (time_found)
         {
-            weechat_arraylist_insert (messages, 0, strdup (*message));
-            weechat_string_dyn_copy (message, NULL);
+            /* add message (will be freed when arraylist is destroyed) */
+            weechat_arraylist_insert (messages, 0, message);
+            message = NULL;
         }
     }
 
-    if ((*message)[0])
-        weechat_arraylist_insert (messages, 0, strdup (*message));
-
-    weechat_string_dyn_free (message, 1);
-    weechat_string_dyn_free (old_message, 1);
+    if (message)
+    {
+        /* add message (will be freed when arraylist is destroyed) */
+        weechat_arraylist_insert (messages, 0, message);
+    }
 
     return messages;
+
+error:
+    if (message)
+        free (message);
+    if (messages)
+        weechat_arraylist_free (messages);
+    return NULL;
 }
 
 /*
@@ -243,7 +261,6 @@ logger_backlog_file (struct t_gui_buffer *buffer, const char *filename,
     struct t_arraylist *last_lines, *messages;
     int i, num_msgs, old_input_multiline;
 
-    num_msgs = 0;
     last_lines = logger_tail_file (filename, lines);
     if (!last_lines)
         return;

src/plugins/logger/logger-tail.c

@@ -100,7 +100,7 @@ logger_tail_lines_free_cb (void *data, struct t_arraylist *arraylist,
 struct t_arraylist *
 logger_tail_file (const char *filename, int lines)
 {
-    int fd;
+    int fd, count_read;
     off_t file_length, file_pos;
     size_t to_read;
     ssize_t bytes_read;
@@ -108,21 +108,30 @@ logger_tail_file (const char *filename, int lines)
     char *ptr_buf, *pos_eol, *part_of_line, *new_part_of_line, *line;
     struct t_arraylist *list_lines;
 
-    if (!filename || (lines < 1))
+    if (!filename || !filename[0] || (lines < 1))
         return NULL;
 
+    fd = -1;
+    part_of_line = 0;
+    list_lines = NULL;
+
+    /* allocate arraylist */
+    list_lines = weechat_arraylist_new (lines, 0, 1,
+                                        &logger_tail_lines_cmp_cb, NULL,
+                                        &logger_tail_lines_free_cb, NULL);
+    if (!list_lines)
+        goto error;
+
     /* open file */
     fd = open (filename, O_RDONLY);
     if (fd == -1)
-        return NULL;
+        goto error;
 
     /* seek to the end of file */
+    count_read = 0;
     file_length = lseek (fd, (off_t)0, SEEK_END);
     if (file_length <= 0)
-    {
-        close (fd);
-        return NULL;
-    }
+        goto error;
     to_read = file_length;
     file_pos = file_length - LOGGER_TAIL_BUFSIZE;
     if (file_pos < 0)
@@ -132,71 +141,51 @@ logger_tail_file (const char *filename, int lines)
     lseek (fd, file_pos, SEEK_SET);
 
     /* loop until we have "lines" lines in list */
-    part_of_line = NULL;
-    list_lines = weechat_arraylist_new (lines, 0, 1,
-                                        &logger_tail_lines_cmp_cb, NULL,
-                                        &logger_tail_lines_free_cb, NULL);
     while (lines > 0)
     {
         lseek (fd, file_pos, SEEK_SET);
         bytes_read = read (fd, buf, to_read);
         if (bytes_read <= 0)
-        {
-            if (part_of_line)
-                free (part_of_line);
-            weechat_arraylist_free (list_lines);
-            close (fd);
-            return NULL;
-        }
+            goto error;
+        count_read++;
         buf[bytes_read] = '\0';
+        if ((count_read == 1)
+            && ((buf[bytes_read - 1] == '\n') || (buf[bytes_read - 1] == '\r')))
+        {
+            /* ignore last new line of the file (on first block read only) */
+            buf[bytes_read - 1] = '\0';
+            bytes_read--;
+        }
         ptr_buf = buf + bytes_read - 1;
         while (ptr_buf && (ptr_buf >= buf))
         {
             pos_eol = (char *)logger_tail_last_eol (buf, ptr_buf);
-            if ((pos_eol && (pos_eol[1] || part_of_line)) || (file_pos == 0))
+            if (pos_eol)
             {
-                /* use data and part_of_line (if existing) to build a new line */
-                if (!pos_eol)
+                ptr_buf = pos_eol - 1;
+                pos_eol[0] = '\0';
+                pos_eol++;
+                if (part_of_line)
                 {
-                    ptr_buf = NULL;
-                    pos_eol = buf;
+                    line = malloc ((strlen (pos_eol) +
+                                    strlen (part_of_line) + 1));
+                    if (!line)
+                        goto error;
+                    strcpy (line, pos_eol);
+                    strcat (line, part_of_line);
+                    free (part_of_line);
+                    part_of_line = NULL;
+                    weechat_arraylist_insert (list_lines, 0, line);
                 }
                 else
                 {
-                    ptr_buf = pos_eol - 1;
-                    pos_eol[0] = '\0';
-                    pos_eol++;
-                }
-                if (part_of_line || pos_eol[0])
-                {
-                    if (part_of_line)
-                    {
-                        line = malloc ((strlen (pos_eol) +
-                                        strlen (part_of_line) + 1));
-                        if (!line)
-                        {
-                            free (part_of_line);
-                            weechat_arraylist_free (list_lines);
-                            close (fd);
-                            return NULL;
-                        }
-                        strcpy (line, pos_eol);
-                        strcat (line, part_of_line);
-                        free (part_of_line);
-                        part_of_line = NULL;
-                        weechat_arraylist_insert (list_lines, 0, line);
-                    }
-                    else
-                    {
-                        weechat_arraylist_insert (list_lines, 0,
-                                                  strdup (pos_eol));
-                    }
-                    lines--;
-                    if (lines <= 0)
-                        break;
+                    weechat_arraylist_insert (list_lines, 0, strdup (pos_eol));
                 }
+                lines--;
+                if (lines <= 0)
+                    break;
             }
-            else if (!pos_eol)
+            else
             {
                 /*
                  * beginning of read buffer reached without EOL, then we
@@ -206,12 +195,7 @@ logger_tail_file (const char *filename, int lines)
                 {
                     new_part_of_line = malloc (strlen (buf) + strlen (part_of_line) + 1);
                     if (!new_part_of_line)
-                    {
-                        free (part_of_line);
-                        weechat_arraylist_free (list_lines);
-                        close (fd);
-                        return NULL;
-                    }
+                        goto error;
                     strcpy (new_part_of_line, buf);
                     strcat (new_part_of_line, part_of_line);
                     free (part_of_line);
@@ -220,12 +204,12 @@ logger_tail_file (const char *filename, int lines)
                 else
                 {
                     part_of_line = malloc (strlen (buf) + 1);
+                    if (!part_of_line)
+                        goto error;
                     strcpy (part_of_line, buf);
                 }
                 ptr_buf = NULL;
             }
-            else
-                ptr_buf = pos_eol - 1;
         }
         if (file_pos == 0)
             break;
@@ -238,9 +222,21 @@ logger_tail_file (const char *filename, int lines)
     }
 
     if (part_of_line)
-        free (part_of_line);
+    {
+        /* add part of line (will be freed when arraylist is destroyed) */
+        weechat_arraylist_insert (list_lines, 0, part_of_line);
+    }
 
     close (fd);
 
     return list_lines;
+
+error:
+    if (part_of_line)
+        free (part_of_line);
+    if (list_lines)
+        weechat_arraylist_free (list_lines);
+    if (fd >= 0)
+        close (fd);
+    return NULL;
 }

src/plugins/lua/weechat-lua.c

@@ -975,7 +975,7 @@ weechat_lua_command_cb (const void *pointer, void *data,
             {
                 /* load lua script */
                 path_script = plugin_script_search_path (weechat_lua_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_lua_load ((path_script) ? path_script : ptr_name,
                                   NULL);
                 if (path_script)

src/plugins/perl/weechat-perl.c

@@ -22,6 +22,7 @@
 
 #undef _
 
+#include <locale.h>
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
@@ -567,6 +568,10 @@ weechat_perl_load (const char *filename, const char *code)
     temp_script.interpreter = (PerlInterpreter *) perl_current_interpreter;
     perl_parse (perl_current_interpreter, weechat_perl_api_init,
                 perl_args_count, perl_args, NULL);
+#if PERL_REVISION >= 6 || (PERL_REVISION == 5 && PERL_VERSION >= 38)
+    /* restore the locale that could be changed by Perl >= 5.38 */
+    Perl_setlocale (LC_CTYPE, "");
+#endif
     length = strlen (perl_weechat_code) + strlen (str_warning) +
         strlen (str_error) - 2 + 4 + strlen ((code) ? code : filename) + 4 + 1;
     perl_code = malloc (length);
@@ -958,7 +963,7 @@ weechat_perl_command_cb (const void *pointer, void *data,
             {
                 /* load perl script */
                 path_script = plugin_script_search_path (weechat_perl_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_perl_load ((path_script) ? path_script : ptr_name,
                                    NULL);
                 if (path_script)
@@ -1290,6 +1295,10 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
     perl_construct (perl_main);
     perl_parse (perl_main, weechat_perl_api_init, perl_args_count,
                 perl_args, NULL);
+#if PERL_REVISION >= 6 || (PERL_REVISION == 5 && PERL_VERSION >= 38)
+    /* restore the locale that could be changed by Perl >= 5.38 */
+    Perl_setlocale (LC_CTYPE, "");
+#endif
 #endif /* MULTIPLICITY */
 
     perl_data.config_file = &perl_config_file;

src/plugins/php/weechat-php.c

@@ -977,7 +977,7 @@ weechat_php_command_cb (const void *pointer, void *data,
             {
                 /* load PHP script */
                 path_script = plugin_script_search_path (weechat_php_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_php_load ((path_script) ? path_script : ptr_name,
                                   NULL);
                 if (path_script)

src/plugins/plugin-config.c

@@ -114,7 +114,7 @@ plugin_config_set (const char *plugin_name, const char *option_name,
                    const char *value)
 {
     int length, rc;
-    char *option_full_name, *option_full_name_lower;
+    char *option_full_name;
 
     rc = WEECHAT_CONFIG_OPTION_SET_ERROR;
 
@@ -124,12 +124,7 @@ plugin_config_set (const char *plugin_name, const char *option_name,
     {
         snprintf (option_full_name, length, "%s.%s",
                   plugin_name, option_name);
-        option_full_name_lower = string_tolower (option_full_name);
-        if (option_full_name_lower)
-        {
-            rc = plugin_config_set_internal (option_full_name_lower, value);
-            free (option_full_name_lower);
-        }
+        rc = plugin_config_set_internal (option_full_name, value);
         free (option_full_name);
     }
 
@@ -206,7 +201,7 @@ plugin_config_set_desc (const char *plugin_name, const char *option_name,
                         const char *description)
 {
     int length;
-    char *option_full_name, *option_full_name_lower;
+    char *option_full_name;
 
     length = strlen (plugin_name) + 1 + strlen (option_name) + 1;
     option_full_name = malloc (length);
@@ -214,13 +209,7 @@ plugin_config_set_desc (const char *plugin_name, const char *option_name,
     {
         snprintf (option_full_name, length, "%s.%s",
                   plugin_name, option_name);
-        option_full_name_lower = string_tolower (option_full_name);
-        if (option_full_name_lower)
-        {
-            plugin_config_set_desc_internal (option_full_name_lower,
-                                             description);
-            free (option_full_name_lower);
-        }
+        plugin_config_set_desc_internal (option_full_name, description);
         free (option_full_name);
     }
 }

src/plugins/plugin-script.c

@@ -536,7 +536,8 @@ plugin_script_search_by_full_name (struct t_plugin_script *scripts,
 
 char *
 plugin_script_search_path (struct t_weechat_plugin *weechat_plugin,
-                           const char *filename)
+                           const char *filename,
+                           int search_system_dir)
 {
     char *final_name, *weechat_data_dir, *dir_system;
     int length;
@@ -601,28 +602,31 @@ plugin_script_search_path (struct t_weechat_plugin *weechat_plugin,
         free (weechat_data_dir);
     }
 
-    /* try WeeChat system dir */
-    dir_system = weechat_info_get ("weechat_sharedir", "");
-    if (dir_system)
+    if (search_system_dir)
     {
-        length = strlen (dir_system) + strlen (weechat_plugin->name) +
-            strlen (filename) + 16;
-        final_name = malloc (length);
-        if (final_name)
+        /* try WeeChat system dir */
+        dir_system = weechat_info_get ("weechat_sharedir", "");
+        if (dir_system)
         {
-            snprintf (final_name,length,
-                      "%s/%s/%s", dir_system, weechat_plugin->name, filename);
-            if ((stat (final_name, &st) == 0) && (st.st_size > 0))
+            length = strlen (dir_system) + strlen (weechat_plugin->name) +
+                strlen (filename) + 16;
+            final_name = malloc (length);
+            if (final_name)
             {
-                free (dir_system);
-                return final_name;
+                snprintf (final_name,length,
+                          "%s/%s/%s", dir_system, weechat_plugin->name, filename);
+                if ((stat (final_name, &st) == 0) && (st.st_size > 0))
+                {
+                    free (dir_system);
+                    return final_name;
+                }
+                free (final_name);
             }
-            free (final_name);
+            free (dir_system);
         }
-        free (dir_system);
     }
 
-    return strdup (filename);
+    return NULL;
 }
 
 /*
@@ -1146,17 +1150,9 @@ plugin_script_remove_file (struct t_weechat_plugin *weechat_plugin,
     i = 0;
     while (i < 2)
     {
-        path_script = plugin_script_search_path (weechat_plugin, name);
-        /*
-         * script not found? (if path_script == name, that means the function
-         * above did not find the script)
-         */
-        if (!path_script || (strcmp (path_script, name) == 0))
-        {
-            if (path_script)
-                free (path_script);
+        path_script = plugin_script_search_path (weechat_plugin, name, 0);
+        if (!path_script)
             break;
-        }
         num_found++;
         if (unlink (path_script) == 0)
         {
@@ -1216,7 +1212,7 @@ plugin_script_action_install (struct t_weechat_plugin *weechat_plugin,
                               char **list)
 {
     char **argv, *name, *ptr_base_name, *base_name, *new_path, *autoload_path;
-    char *symlink_path, str_signal[128], *ptr_list, *weechat_data_dir, *dir_separator;
+    char *symlink_path, str_signal[128], *ptr_name, *weechat_data_dir, *dir_separator;
     int argc, i, length, rc, autoload, existing_script, script_loaded;
     struct t_plugin_script *ptr_script;
 
@@ -1226,30 +1222,7 @@ plugin_script_action_install (struct t_weechat_plugin *weechat_plugin,
     /* create again directories, just in case they have been removed */
     plugin_script_create_dirs (weechat_plugin);
 
-    ptr_list = *list;
-    autoload = 0;
-    *quiet = 0;
-
-    while ((ptr_list[0] == ' ') || (ptr_list[0] == '-'))
-    {
-        if (ptr_list[0] == ' ')
-            ptr_list++;
-        else
-        {
-            switch (ptr_list[1])
-            {
-                case 'a': /* autoload */
-                    autoload = 1;
-                    break;
-                case 'q': /* quiet mode */
-                    *quiet = 1;
-                    break;
-            }
-            ptr_list += 2;
-        }
-    }
-
-    argv = weechat_string_split (ptr_list, ",", NULL,
+    argv = weechat_string_split (*list, ",", NULL,
                                  WEECHAT_STRING_SPLIT_STRIP_LEFT
                                  | WEECHAT_STRING_SPLIT_STRIP_RIGHT
                                  | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS,
@@ -1258,7 +1231,30 @@ plugin_script_action_install (struct t_weechat_plugin *weechat_plugin,
     {
         for (i = 0; i < argc; i++)
         {
-            name = strdup (argv[i]);
+            autoload = 0;
+            *quiet = 0;
+            ptr_name = argv[i];
+            while ((ptr_name[0] == ' ') || (ptr_name[0] == '-'))
+            {
+                if (ptr_name[0] == ' ')
+                {
+                    ptr_name++;
+                }
+                else
+                {
+                    switch (ptr_name[1])
+                    {
+                        case 'a': /* autoload */
+                            autoload = 1;
+                            break;
+                        case 'q': /* quiet mode */
+                            *quiet = 1;
+                            break;
+                    }
+                    ptr_name += 2;
+                }
+            }
+            name = strdup (ptr_name);
             if (name)
             {
                 ptr_base_name = basename (name);
@@ -1350,6 +1346,13 @@ plugin_script_action_install (struct t_weechat_plugin *weechat_plugin,
                     free (base_name);
                     if (weechat_data_dir)
                         free (weechat_data_dir);
+
+                    /* send signal */
+                    snprintf (str_signal, sizeof (str_signal),
+                              "%s_script_installed", weechat_plugin->name);
+                    (void) weechat_hook_signal_send (str_signal,
+                                                     WEECHAT_HOOK_SIGNAL_STRING,
+                                                     name);
                 }
                 free (name);
             }
@@ -1359,11 +1362,6 @@ plugin_script_action_install (struct t_weechat_plugin *weechat_plugin,
 
     *quiet = 0;
 
-    snprintf (str_signal, sizeof (str_signal),
-              "%s_script_installed", weechat_plugin->name);
-    (void) weechat_hook_signal_send (str_signal, WEECHAT_HOOK_SIGNAL_STRING,
-                                     ptr_list);
-
     free (*list);
     *list = NULL;
 }
@@ -1383,7 +1381,7 @@ plugin_script_action_remove (struct t_weechat_plugin *weechat_plugin,
                              int *quiet,
                              char **list)
 {
-    char **argv, str_signal[128], *ptr_list;
+    char **argv, str_signal[128], *ptr_name;
     int argc, i;
     struct t_plugin_script *ptr_script;
 
@@ -1393,15 +1391,7 @@ plugin_script_action_remove (struct t_weechat_plugin *weechat_plugin,
     /* create again directories, just in case they have been removed */
     plugin_script_create_dirs (weechat_plugin);
 
-    ptr_list = *list;
-    *quiet = 0;
-    if (strncmp (ptr_list, "-q ", 3) == 0)
-    {
-        *quiet = 1;
-        ptr_list += 3;
-    }
-
-    argv = weechat_string_split (ptr_list, ",", NULL,
+    argv = weechat_string_split (*list, ",", NULL,
                                  WEECHAT_STRING_SPLIT_STRIP_LEFT
                                  | WEECHAT_STRING_SPLIT_STRIP_RIGHT
                                  | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS,
@@ -1410,25 +1400,35 @@ plugin_script_action_remove (struct t_weechat_plugin *weechat_plugin,
     {
         for (i = 0; i < argc; i++)
         {
+            ptr_name = argv[i];
+            *quiet = 0;
+            if (strncmp (ptr_name, "-q ", 3) == 0)
+            {
+                *quiet = 1;
+                ptr_name += 3;
+            }
+
             /* unload script, if script is loaded */
-            ptr_script = plugin_script_search_by_full_name (scripts, argv[i]);
+            ptr_script = plugin_script_search_by_full_name (scripts, ptr_name);
             if (ptr_script)
                 (*script_unload) (ptr_script);
 
             /* remove script file(s) */
-            (void) plugin_script_remove_file (weechat_plugin, argv[i],
+            (void) plugin_script_remove_file (weechat_plugin, ptr_name,
                                               *quiet, 1);
+
+            /* send signal */
+            snprintf (str_signal, sizeof (str_signal),
+                      "%s_script_removed", weechat_plugin->name);
+            (void) weechat_hook_signal_send (str_signal,
+                                             WEECHAT_HOOK_SIGNAL_STRING,
+                                             ptr_name);
         }
         weechat_string_free_split (argv);
     }
 
     *quiet = 0;
 
-    snprintf (str_signal, sizeof (str_signal),
-              "%s_script_removed", weechat_plugin->name);
-    (void) weechat_hook_signal_send (str_signal, WEECHAT_HOOK_SIGNAL_STRING,
-                                     ptr_list);
-
     free (*list);
     *list = NULL;
 }
@@ -1443,7 +1443,7 @@ plugin_script_action_autoload (struct t_weechat_plugin *weechat_plugin,
                                char **list)
 {
     char **argv, *name, *ptr_base_name, *base_name, *autoload_path;
-    char *symlink_path, *ptr_list, *weechat_data_dir, *dir_separator;
+    char *symlink_path, *ptr_name, *weechat_data_dir, *dir_separator;
     int argc, i, length, rc, autoload;
 
     if (!*list)
@@ -1452,30 +1452,7 @@ plugin_script_action_autoload (struct t_weechat_plugin *weechat_plugin,
     /* create again directories, just in case they have been removed */
     plugin_script_create_dirs (weechat_plugin);
 
-    ptr_list = *list;
-    autoload = 0;
-    *quiet = 0;
-
-    while ((ptr_list[0] == ' ') || (ptr_list[0] == '-'))
-    {
-        if (ptr_list[0] == ' ')
-            ptr_list++;
-        else
-        {
-            switch (ptr_list[1])
-            {
-                case 'a': /* no autoload */
-                    autoload = 1;
-                    break;
-                case 'q': /* quiet mode */
-                    *quiet = 1;
-                    break;
-            }
-            ptr_list += 2;
-        }
-    }
-
-    argv = weechat_string_split (ptr_list, ",", NULL,
+    argv = weechat_string_split (*list, ",", NULL,
                                  WEECHAT_STRING_SPLIT_STRIP_LEFT
                                  | WEECHAT_STRING_SPLIT_STRIP_RIGHT
                                  | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS,
@@ -1484,7 +1461,30 @@ plugin_script_action_autoload (struct t_weechat_plugin *weechat_plugin,
     {
         for (i = 0; i < argc; i++)
         {
-            name = strdup (argv[i]);
+            ptr_name = argv[i];
+            autoload = 0;
+            *quiet = 0;
+            while ((ptr_name[0] == ' ') || (ptr_name[0] == '-'))
+            {
+                if (ptr_name[0] == ' ')
+                {
+                    ptr_name++;
+                }
+                else
+                {
+                    switch (ptr_name[1])
+                    {
+                        case 'a': /* no autoload */
+                            autoload = 1;
+                            break;
+                        case 'q': /* quiet mode */
+                            *quiet = 1;
+                            break;
+                    }
+                    ptr_name += 2;
+                }
+            }
+            name = strdup (ptr_name);
             if (name)
             {
                 ptr_base_name = basename (name);

src/plugins/plugin-script.h

@@ -135,7 +135,8 @@ extern void plugin_script_auto_load (struct t_weechat_plugin *weechat_plugin,
 extern struct t_plugin_script *plugin_script_search (struct t_plugin_script *scripts,
                                                      const char *name);
 extern char *plugin_script_search_path (struct t_weechat_plugin *weechat_plugin,
-                                        const char *filename);
+                                        const char *filename,
+                                        int search_system_dir);
 extern struct t_plugin_script *plugin_script_alloc (const char *filename,
                                                     const char *name,
                                                     const char *author,

src/plugins/python/weechat-python-api.c

@@ -80,6 +80,8 @@
     return PyLong_FromLong((long)__int)
 #define API_RETURN_LONG(__long)                                         \
     return PyLong_FromLong(__long)
+#define API_RETURN_LONGLONG(__longlong)                                 \
+    return PyLong_FromLongLong(__longlong)
 
 
 /*
@@ -374,14 +376,14 @@ API_FUNC(string_parse_size)
     char *size;
     unsigned long long value;
 
-    API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONG(0));
+    API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONGLONG(0));
     size = NULL;
     if (!PyArg_ParseTuple (args, "s", &size))
-        API_WRONG_ARGS(API_RETURN_LONG(0));
+        API_WRONG_ARGS(API_RETURN_LONGLONG(0));
 
     value = weechat_string_parse_size (size);
 
-    API_RETURN_LONG(value);
+    API_RETURN_LONGLONG(value);
 }
 
 API_FUNC(string_color_code_size)

src/plugins/python/weechat-python.c

@@ -1201,7 +1201,7 @@ weechat_python_command_cb (const void *pointer, void *data,
             {
                 /* load python script */
                 path_script = plugin_script_search_path (weechat_python_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_python_load ((path_script) ? path_script : ptr_name,
                                      NULL);
                 if (path_script)

src/plugins/python/weechat.pyi

@@ -3,7 +3,7 @@
 # DO NOT EDIT BY HAND!
 #
 
-from typing import Dict
+from typing import Dict, Union
 
 WEECHAT_RC_OK: int = 0
 WEECHAT_RC_OK_EAT: int = 1
@@ -539,7 +539,7 @@ def config_new_section(config_file: str, name: str,
     ::
 
         # example
-        def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+        def my_section_read_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
             # ...
             return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
             # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -558,7 +558,7 @@ def config_new_section(config_file: str, name: str,
             # return weechat.WEECHAT_CONFIG_WRITE_ERROR
             # return weechat.WEECHAT_CONFIG_WRITE_MEMORY_ERROR
 
-        def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: str | None) -> int:
+        def my_section_create_option_cb(data: str, config_file: str, section: str, option_name: str, value: Union[str, None]) -> int:
             # ...
             return weechat.WEECHAT_CONFIG_OPTION_SET_OK_CHANGED
             # return weechat.WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE
@@ -594,7 +594,7 @@ def config_search_section(config_file: str, section_name: str) -> str:
 
 def config_new_option(config_file: str, section: str, name: str, type: str, description: str,
                       string_values: str, min: int, max: int,
-                      default_value: str | None, value: str | None, null_value_allowed: int,
+                      default_value: Union[str, None], value: Union[str, None], null_value_allowed: int,
                       callback_check_value: str, callback_check_value_data: str,
                       callback_change: str, callback_change_data: str,
                       callback_delete: str, callback_delete_data: str) -> str:

src/plugins/relay/irc/relay-irc.c

@@ -206,7 +206,7 @@ relay_irc_sendf (struct t_relay_client *client, const char *format, ...)
     const char *str_message, *ptr_msg1, *ptr_msg2;
     struct t_hashtable *hashtable_in, *hashtable_out;
 
-    if (!client)
+    if (!client || !format)
         return;
 
     weechat_va_format (format);
@@ -616,6 +616,13 @@ relay_irc_signal_irc_disc_cb (const void *pointer, void *data,
 
     if (strcmp ((char *)signal_data, client->protocol_args) == 0)
     {
+        relay_irc_sendf (client,
+                         ":%s ERROR :WeeChat: disconnected from server \"%s\"",
+                         RELAY_IRC_DATA(client, address),
+                         client->protocol_args);
+        relay_irc_sendf (client,
+                         ":%s ERROR :Closing Link",
+                         RELAY_IRC_DATA(client, address));
         relay_client_set_status (client, RELAY_STATUS_DISCONNECTED);
     }
 
@@ -1581,6 +1588,53 @@ relay_irc_recv_command_capab (struct t_relay_client *client,
     }
 }
 
+/*
+ * Parses CTCP message and return CTCP type and parameters.
+ * If message is not a valid CTCP format, type and parameters are set to NULL.
+ *
+ * Examples:
+ *
+ *   message                   | type      | params
+ *   --------------------------|-----------|-----------
+ *   "\01ACTION is testing\01" | "ACTION"  | "is testing"
+ *   "\01VERSION\01"           | "VERSION" | NULL
+ *   "\01VERSION"              | NULL      | NULL
+ *   "test"                    | NULL      | NULL
+ */
+
+void
+relay_irc_parse_ctcp (const char *message, char **ctcp_type, char **ctcp_params)
+{
+    const char *pos_space, *pos_end;
+
+    if (!ctcp_type || !ctcp_params)
+        return;
+
+    *ctcp_type = NULL;
+    *ctcp_params = NULL;
+
+    if (!message)
+        return;
+
+    if (message[0] != '\01')
+        return;
+
+    pos_end = strrchr (message + 1, '\01');
+    if (!pos_end)
+        return;
+
+    pos_space = strchr (message, ' ' );
+    if (pos_space && (pos_space < pos_end))
+    {
+        *ctcp_type = weechat_strndup (message + 1, pos_space - message - 1);
+        *ctcp_params = weechat_strndup (pos_space + 1, pos_end - pos_space - 1);
+    }
+    else
+    {
+        *ctcp_type = weechat_strndup (message + 1, pos_end - message - 1);
+    }
+}
+
 /*
  * Reads one message from client.
  */
@@ -1595,7 +1649,7 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
     char str_time[128], str_signal[128], str_server_channel[256], *nick;
     char str_param[128], *str_args, *version, str_command[128], **params;
     char *pos, *password, *irc_is_channel, *info, *error, *str_cmd_lower;
-    char modifier_data[128], *new_data;
+    char modifier_data[128], *new_data, *ctcp_type, *ctcp_params;
     long num_params;
     int i, redirect_msg;
 
@@ -1933,26 +1987,61 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
             {
                 str_args = weechat_string_rebuild_split_string (
                     (const char **)params, " ", 1, -1);
+                relay_irc_parse_ctcp (str_args, &ctcp_type, &ctcp_params);
                 irc_is_channel = weechat_info_get ("irc_is_channel", params[0]);
                 if (irc_is_channel && (strcmp (irc_is_channel, "1") == 0))
                 {
-                    relay_irc_input_send (client, params[0],
-                                          "priority_high,user_message",
-                                          "%s",
-                                          (str_args) ? str_args : "");
+                    if (ctcp_type)
+                    {
+                        relay_irc_input_send (client, NULL,
+                                              "priority_high",
+                                              "/ctcp %s %s%s%s",
+                                              params[0],
+                                              ctcp_type,
+                                              (ctcp_params) ? " " : "",
+                                              (ctcp_params) ? ctcp_params : "");
+                    }
+                    else
+                    {
+                        relay_irc_input_send (client, params[0],
+                                              "priority_high,user_message",
+                                              "%s",
+                                              (str_args) ? str_args : "");
+                    }
                 }
                 else
                 {
-                    relay_irc_input_send (client, NULL,
-                                          "priority_high",
-                                          "/query %s %s",
-                                          params[0],
-                                          (str_args) ? str_args : "");
+                    if (ctcp_type)
+                    {
+                        relay_irc_input_send (client, NULL,
+                                              "priority_high",
+                                              "/query %s",
+                                              params[0]);
+                        relay_irc_input_send (client, NULL,
+                                              "priority_high",
+                                              "/ctcp %s %s%s%s",
+                                              params[0],
+                                              ctcp_type,
+                                              (ctcp_params) ? " " : "",
+                                              (ctcp_params) ? ctcp_params : "");
+                    }
+                    else
+                    {
+                        relay_irc_input_send (client, NULL,
+                                              "priority_high",
+                                              "/query %s %s",
+                                              params[0],
+                                              (str_args) ? str_args : "");
+                    }
                 }
                 if (str_args)
                     free (str_args);
                 if (irc_is_channel)
                     free (irc_is_channel);
+                if (ctcp_type)
+                    free (ctcp_type);
+                if (ctcp_params)
+                    free (ctcp_params);
             }
         }
         else if (!relay_irc_command_ignored (irc_command))

src/plugins/relay/relay-auth.c

@@ -247,6 +247,7 @@ relay_auth_parse_pbkdf2 (const char *parameters,
     }
 
     /* parameter 2: iterations */
+    error = NULL;
     *iterations = (int)strtol (argv[1], &error, 10);
     if (!error || error[0])
         *iterations = 0;

src/plugins/ruby/weechat-ruby-api.c

@@ -77,6 +77,8 @@
     return INT2FIX (__int)
 #define API_RETURN_LONG(__long)                                         \
     return LONG2NUM (__long)
+#define API_RETURN_LONGLONG(__longlong)                                 \
+    return LL2NUM (__longlong)
 
 
 /*
@@ -454,9 +456,9 @@ weechat_ruby_api_string_parse_size (VALUE class, VALUE size)
     char *c_size;
     unsigned long long value;
 
-    API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONG(0));
+    API_INIT_FUNC(1, "string_parse_size", API_RETURN_LONGLONG(0));
     if (NIL_P (size))
-        API_WRONG_ARGS(API_RETURN_LONG(0));
+        API_WRONG_ARGS(API_RETURN_LONGLONG(0));
 
     Check_Type (size, T_STRING);
 
@@ -464,7 +466,7 @@ weechat_ruby_api_string_parse_size (VALUE class, VALUE size)
 
     value = weechat_string_parse_size (c_size);
 
-    API_RETURN_LONG(value);
+    API_RETURN_LONGLONG(value);
 }
 
 static VALUE

src/plugins/ruby/weechat-ruby.c

@@ -287,7 +287,7 @@ weechat_ruby_print_exception (VALUE err)
         err_class = StringValuePtr (class_name);
     }
 
-    if (strcmp (err_class, "SyntaxError") == 0)
+    if (err_class && (strcmp (err_class, "SyntaxError") == 0))
     {
         tmp3 = rb_inspect (err);
         weechat_printf (NULL,
@@ -1003,7 +1003,7 @@ weechat_ruby_command_cb (const void *pointer, void *data,
             {
                 /* load ruby script */
                 path_script = plugin_script_search_path (weechat_ruby_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_ruby_load ((path_script) ? path_script : ptr_name,
                                    NULL);
                 if (path_script)

src/plugins/script/script-action.c

@@ -1254,6 +1254,9 @@ script_action_run_all ()
                                     | WEECHAT_STRING_SPLIT_STRIP_RIGHT
                                     | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS,
                                     0, &num_actions);
+
+    script_action_clear ();
+
     if (actions)
     {
         for (i = 0; i < num_actions; i++)
@@ -1511,8 +1514,6 @@ script_action_run_all ()
         weechat_string_free_split (actions);
     }
 
-    script_action_clear ();
-
     return 1;
 }
 

src/plugins/script/script-command.c

@@ -144,20 +144,6 @@ script_command_script (const void *pointer, void *data,
         return WEECHAT_RC_OK;
     }
 
-    if (weechat_strcmp (argv[1], "go") == 0)
-    {
-        if ((argc > 2) && script_buffer && !script_buffer_detail_script)
-        {
-            error = NULL;
-            value = strtol (argv[2], &error, 10);
-            if (error && !error[0])
-            {
-                script_buffer_set_current_line (value);
-            }
-        }
-        return WEECHAT_RC_OK;
-    }
-
     if (weechat_strcmp (argv[1], "search") == 0)
     {
         if (scripts_repo)
@@ -216,6 +202,21 @@ script_command_script (const void *pointer, void *data,
         return WEECHAT_RC_OK;
     }
 
+    if (weechat_strcmp (argv[1], "go") == 0)
+    {
+        if ((argc > 2) && script_buffer && !script_buffer_detail_script)
+        {
+            error = NULL;
+            value = strtol (argv[2], &error, 10);
+            if (error && !error[0])
+            {
+                script_buffer_set_current_line (value);
+                script_buffer_check_line_outside_window ();
+            }
+        }
+        return WEECHAT_RC_OK;
+    }
+
     if (weechat_strcmp (argv[1], "up") == 0)
     {
         if (script_buffer)

src/plugins/tcl/weechat-tcl.c

@@ -658,7 +658,7 @@ weechat_tcl_command_cb (const void *pointer, void *data,
             {
                 /* load tcl script */
                 path_script = plugin_script_search_path (weechat_tcl_plugin,
-                                                         ptr_name);
+                                                         ptr_name, 1);
                 weechat_tcl_load ((path_script) ? path_script : ptr_name,
                                   NULL);
                 if (path_script)

src/plugins/xfer/xfer-config.h

@@ -25,7 +25,7 @@
 
 #define XFER_CONFIG_PROGRESS_BAR_MAX_SIZE 256
 
-extern struct t_config_file *xfer_config;
+extern struct t_config_file *xfer_config_file;
 
 extern struct t_config_option *xfer_config_look_auto_open_buffer;
 extern struct t_config_option *xfer_config_look_progress_bar_size;

src/plugins/xfer/xfer-network.c

@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -57,17 +58,18 @@ char *
 xfer_network_convert_integer_to_ipv4 (const char *str_address)
 {
     char *error, result[128];
-    long number;
+    long long number;
 
     if (!str_address || !str_address[0])
         return NULL;
 
-    number = strtol (str_address, &error, 10);
-    if (!error || error[0] || (number <= 0))
+    error = NULL;
+    number = strtoll (str_address, &error, 10);
+    if (!error || error[0] || (number <= 0) || (number > UINT32_MAX))
         return NULL;
 
     snprintf (result, sizeof (result),
-              "%ld.%ld.%ld.%ld",
+              "%lld.%lld.%lld.%lld",
               (number >> 24) & 0xFF,
               (number >> 16) & 0xFF,
               (number >> 8) & 0xFF,

src/plugins/xfer/xfer.c

@@ -1842,5 +1842,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
 
     xfer_free_all ();
 
+    weechat_config_free (xfer_config_file);
+
     return WEECHAT_RC_OK;
 }

tests/scripts/python/testapi.py

@@ -83,7 +83,7 @@ def test_strings():
     check(weechat.string_parse_size('123 b') == 123)
     check(weechat.string_parse_size('120k') == 120000)
     check(weechat.string_parse_size('1500m') == 1500000000)
-    check(weechat.string_parse_size('3g') == 3000000000)
+    check(weechat.string_parse_size('2g') == 2000000000)
     check(weechat.string_color_code_size('') == 0)
     check(weechat.string_color_code_size('test') == 0)
     str_color = weechat.color('yellow,red')
@@ -397,8 +397,8 @@ def test_display():
     weechat.prnt('', '## test print core buffer')
     weechat.prnt_date_tags('', 946681200, 'tag1,tag2',
                            '## test print_date_tags core buffer')
-    weechat.prnt_date_tags('', 5680744830, 'tag1,tag2',
-                           '## test print_date_tags core buffer, year 2150')
+    weechat.prnt_date_tags('', 2146383600, 'tag1,tag2',
+                           '## test print_date_tags core buffer, 2038-01-06 09:40:00')
     hdata_buffer = weechat.hdata_get('buffer')
     hdata_lines = weechat.hdata_get('lines')
     hdata_line = weechat.hdata_get('line')
@@ -407,7 +407,7 @@ def test_display():
     own_lines = weechat.hdata_pointer(hdata_buffer, buffer, 'own_lines')
     line = weechat.hdata_pointer(hdata_lines, own_lines, 'last_line')
     data = weechat.hdata_pointer(hdata_line, line, 'data')
-    check(weechat.hdata_time(hdata_line_data, data, 'date') == 5680744830)
+    check(weechat.hdata_time(hdata_line_data, data, 'date') == 2146383600)
     buffer = weechat.buffer_new('test_formatted',
                                 'buffer_input_cb', '', 'buffer_close_cb', '')
     check(buffer != '')
@@ -423,8 +423,8 @@ def test_display():
     weechat.prnt_y(buffer, 0, '## test print_y free buffer')
     weechat.prnt_y_date_tags(buffer, 0, 946681200, 'tag1,tag2',
                              '## test print_y_date_tags free buffer')
-    weechat.prnt_y_date_tags(buffer, 1, 5680744830, 'tag1,tag2',
-                             '## test print_y_date_tags free buffer, year 2150')
+    weechat.prnt_y_date_tags(buffer, 1, 2146383600, 'tag1,tag2',
+                             '## test print_y_date_tags free buffer, 2038-01-06 09:40:00')
     weechat.buffer_close(buffer)
 
 
@@ -476,12 +476,12 @@ def test_hooks():
     weechat.unhook(hook_cmd)
     weechat.unhook(hook_cmplt)
     # hook_timer
-    hook_timer = weechat.hook_timer(5000111000, 0, 1,
+    hook_timer = weechat.hook_timer(2000111000, 0, 1,
                                     'timer_cb', 'timer_cb_data')
     ptr_infolist = weechat.infolist_get('hook', hook_timer, '')
     check(ptr_infolist != '')
     check(weechat.infolist_next(ptr_infolist) == 1)
-    check(weechat.infolist_string(ptr_infolist, 'interval') == '5000111000')
+    check(weechat.infolist_string(ptr_infolist, 'interval') == '2000111000')
     weechat.infolist_free(ptr_infolist)
     weechat.unhook(hook_timer)
 
@@ -504,8 +504,8 @@ def infolist_cb(data, infolist_name, pointer, arguments):
     check(weechat.infolist_new_var_pointer(item, 'pointer', '0xabcdef') != '')
     # Tue Jan 06 2009 08:40:30 GMT+0000
     check(weechat.infolist_new_var_time(item, 'time1', 1231231230) != '')
-    # Tue Jan 06 2150 08:40:30 GMT+0000
-    check(weechat.infolist_new_var_time(item, 'time2', 5680744830) != '')
+    # Wed Jan 06 2038 09:40:00 GMT+0000
+    check(weechat.infolist_new_var_time(item, 'time2', 2146383600) != '')
     return infolist
 
 
@@ -522,7 +522,7 @@ def test_infolist():
     check(weechat.infolist_string(ptr_infolist, 'string') == 'test string')
     check(weechat.infolist_pointer(ptr_infolist, 'pointer') == '0xabcdef')
     check(weechat.infolist_time(ptr_infolist, 'time1') == 1231231230)
-    check(weechat.infolist_time(ptr_infolist, 'time2') == 5680744830)
+    check(weechat.infolist_time(ptr_infolist, 'time2') == 2146383600)
     check(weechat.infolist_fields(ptr_infolist) == 'i:integer,s:string,p:pointer,t:time1,t:time2')
     check(weechat.infolist_next(ptr_infolist) == 0)
     weechat.infolist_free(ptr_infolist)
@@ -549,9 +549,9 @@ def test_hdata():
     check(hdata_irc_server != '')
     # create a test buffer with 3 messages
     buffer2 = weechat.buffer_new('test', 'buffer_input_cb', '', 'buffer_close_cb', '')
-    weechat.prnt_date_tags(buffer2, 5680744830, 'tag1,tag2', 'prefix1\t## msg1')
-    weechat.prnt_date_tags(buffer2, 5680744831, 'tag3,tag4', 'prefix2\t## msg2')
-    weechat.prnt_date_tags(buffer2, 5680744832, 'tag5,tag6', 'prefix3\t## msg3')
+    weechat.prnt_date_tags(buffer2, 2146383600, 'tag1,tag2', 'prefix1\t## msg1')
+    weechat.prnt_date_tags(buffer2, 2146383601, 'tag3,tag4', 'prefix2\t## msg2')
+    weechat.prnt_date_tags(buffer2, 2146383602, 'tag5,tag6', 'prefix3\t## msg3')
     own_lines = weechat.hdata_pointer(hdata_buffer, buffer2, 'own_lines')
     line1 = weechat.hdata_pointer(hdata_lines, own_lines, 'first_line')
     line1_data = weechat.hdata_pointer(hdata_line, line1, 'data')
@@ -599,7 +599,7 @@ def test_hdata():
     # hdata_char
     check(weechat.hdata_char(hdata_line_data, line1_data, 'displayed') == 1)
     # hdata_integer
-    check(weechat.hdata_char(hdata_buffer, buffer2, 'number') == 2)
+    check(weechat.hdata_integer(hdata_buffer, buffer2, 'number') == 2)
     # hdata_long
     weechat.buffer_set(buffer, 'hotlist', weechat.WEECHAT_HOTLIST_MESSAGE)
     gui_hotlist = weechat.hdata_get_list(hdata_hotlist, 'gui_hotlist')
@@ -619,16 +619,16 @@ def test_hdata():
     check(weechat.hdata_compare(hdata_buffer, buffer2, buffer, 'name', 0) < 0)
     check(weechat.hdata_compare(hdata_buffer, buffer, buffer, 'name', 0) == 0)
     # hdata_update
-    check(weechat.hdata_time(hdata_line_data, line1_data, 'date') == 5680744830)
+    check(weechat.hdata_time(hdata_line_data, line1_data, 'date') == 2146383600)
     check(weechat.hdata_string(hdata_line_data, line1_data, 'prefix') == 'prefix1')
     check(weechat.hdata_string(hdata_line_data, line1_data, 'message') == '## msg1')
     update = {
-        'date': '5680744835',
+        'date': '2146383605',
         'prefix': 'new_prefix1',
         'message': 'new_message1'
     }
     check(weechat.hdata_update(hdata_line_data, line1_data, update) == 3)
-    check(weechat.hdata_time(hdata_line_data, line1_data, 'date') == 5680744835)
+    check(weechat.hdata_time(hdata_line_data, line1_data, 'date') == 2146383605)
     check(weechat.hdata_string(hdata_line_data, line1_data, 'prefix') == 'new_prefix1')
     check(weechat.hdata_string(hdata_line_data, line1_data, 'message') == 'new_message1')
     # hdata_get_string

tests/unit/core/test-core-hdata.cpp

@@ -526,7 +526,7 @@ TEST_GROUP(CoreHdataWithList)
         item->test_string = strdup ("item2");
         item->test_string2 = strdup ("string2");
         item->test_string3 = NULL;
-        ptr_item1->test_string_null = NULL;
+        item->test_string_null = NULL;
         item->test_shared_string = string_shared_get ("item2_shared");
         strcpy (item->test_array_2_words_fixed_size[0], "item2-word1");
         strcpy (item->test_array_2_words_fixed_size[1], "item2-word2");

tests/unit/core/test-core-infolist.cpp

@@ -222,7 +222,7 @@ TEST(CoreInfolist, New)
     /* check content of variable */
     STRCMP_EQUAL("test_time", var_time->name);
     LONGS_EQUAL(INFOLIST_TIME, var_time->type);
-    LONGS_EQUAL(1234567890, *((int *)var_time->value));
+    LONGS_EQUAL(1234567890, *((time_t *)var_time->value));
     LONGS_EQUAL(0, var_time->size);
     POINTERS_EQUAL(var_buf, var_time->prev_var);
     POINTERS_EQUAL(NULL, var_time->next_var);

tests/unit/core/test-core-string.cpp

@@ -848,6 +848,7 @@ TEST(CoreString, ExpandHome)
     int length_home;
 
     home = getenv ("HOME");
+    CHECK(home);
     length_home = strlen (home);
 
     POINTERS_EQUAL(NULL, string_expand_home (NULL));
@@ -872,6 +873,7 @@ TEST(CoreString, EvalPathHome)
     struct t_hashtable *extra_vars, *options;
 
     home = getenv ("HOME");
+    CHECK(home);
     length_home = strlen (home);
 
     length_weechat_config_dir = strlen (weechat_config_dir);
@@ -1090,6 +1092,8 @@ TEST(CoreString, IsWhitespaceChar)
 
     LONGS_EQUAL(1, string_is_whitespace_char (" abc def"));
     LONGS_EQUAL(1, string_is_whitespace_char ("\tabc def"));
+    LONGS_EQUAL(1, string_is_whitespace_char ("\nabc def"));
+    LONGS_EQUAL(1, string_is_whitespace_char ("\rabc def"));
 }
 
 /*

tests/unit/gui/test-gui-bar-item-custom.cpp

@@ -455,12 +455,16 @@ TEST(GuiBarItemCustom, Rename)
     CHECK(new_item->bar_item);
     STRCMP_EQUAL("test3", new_item->bar_item->name);
 
+    STRCMP_EQUAL("test3.conditions", new_item->options[GUI_BAR_ITEM_CUSTOM_OPTION_CONDITIONS]->name);
+    STRCMP_EQUAL("test3.content", new_item->options[GUI_BAR_ITEM_CUSTOM_OPTION_CONTENT]->name);
+
     gui_bar_item_custom_free (new_item);
     gui_bar_item_custom_free (new_item2);
 }
 
 /*
  * Tests functions:
+ *   gui_bar_item_custom_free_data
  *   gui_bar_item_custom_free
  *   gui_bar_item_custom_free_all
  */

tests/unit/gui/test-gui-bar-item.cpp

@@ -53,6 +53,21 @@ TEST(GuiBarItem, Valid)
     LONGS_EQUAL(0, gui_bar_item_valid (gui_bar_items + 1));
 }
 
+/*
+ * Tests functions:
+ *   gui_bar_item_search_default
+ */
+
+TEST(GuiBarItem, SearchDefault)
+{
+    LONGS_EQUAL(-1, gui_bar_item_search_default (NULL));
+    LONGS_EQUAL(-1, gui_bar_item_search_default (""));
+    LONGS_EQUAL(-1, gui_bar_item_search_default ("zzz"));
+
+    CHECK(gui_bar_item_search_default ("scroll") >= 0);
+    CHECK(gui_bar_item_search_default ("time") >= 0);
+}
+
 /*
  * Tests functions:
  *   gui_bar_item_search

tests/unit/gui/test-gui-key.cpp

@@ -1051,18 +1051,32 @@ TEST(GuiKey, SeemsValid)
     LONGS_EQUAL(0, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "meta-cb"));
     LONGS_EQUAL(0, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "meta-updown"));
     LONGS_EQUAL(0, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "@chat:button1"));
+    LONGS_EQUAL(0, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "meta-test"));
+    LONGS_EQUAL(0, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "ctrl-test"));
+    LONGS_EQUAL(0, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "shift-test"));
 
     /* valid keys */
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "a"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "A"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "é"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "/"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "f1"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "f10"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "f11"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "f2"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "f20"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "meta-a"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "meta-ctrl-a"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "meta-c,b"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "meta-w,meta-up"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "ctrl-left"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "ctrl-u"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "shift-home"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "shift-f1"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "shift-f10"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "shift-f11"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "shift-f2"));
+    LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_DEFAULT, "shift-f20"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_CURSOR, "@chat:q"));
     LONGS_EQUAL(1, gui_key_seems_valid (GUI_KEY_CONTEXT_MOUSE, "@chat:button1"));
 }

tests/unit/plugins/irc/test-irc-batch.cpp

@@ -26,6 +26,8 @@
 extern "C"
 {
 #include <string.h>
+#include "src/core/wee-hashtable.h"
+#include "src/plugins/weechat-plugin.h"
 #include "src/plugins/irc/irc-batch.h"
 #include "src/plugins/irc/irc-server.h"
 }
@@ -43,14 +45,23 @@ TEST(IrcBatch, Search)
 {
     struct t_irc_server *server;
     struct t_irc_batch *batch1, *batch2;
+    struct t_hashtable *tags;
 
     server = irc_server_alloc ("server");
     CHECK(server);
 
-    batch1 = irc_batch_start_batch (server, "ref1", "parent_ref", "type", "params");
+    tags = hashtable_new (32,
+                          WEECHAT_HASHTABLE_STRING,
+                          WEECHAT_HASHTABLE_STRING,
+                          NULL, NULL);
+    CHECK(tags);
+    hashtable_set (tags, "time", "2023-08-09T07:43:01.830Z");
+    hashtable_set (tags, "msgid", "icqfzy7zdbpix4gy8pvzuv49kw");
+
+    batch1 = irc_batch_start_batch (server, "ref1", "parent_ref", "type", "params", tags);
     CHECK(batch1);
 
-    batch2 = irc_batch_start_batch (server, "ref2", "parent_ref", "type", "params");
+    batch2 = irc_batch_start_batch (server, "ref2", "parent_ref", "type", "params", NULL);
     CHECK(batch2);
 
     POINTERS_EQUAL(NULL, irc_batch_search (NULL, NULL));
@@ -105,19 +116,29 @@ TEST(IrcBatch, StartBatch)
 {
     struct t_irc_server *server;
     struct t_irc_batch *batch;
+    struct t_hashtable *tags;
 
     server = irc_server_alloc ("server");
     CHECK(server);
 
+    tags = hashtable_new (32,
+                          WEECHAT_HASHTABLE_STRING,
+                          WEECHAT_HASHTABLE_STRING,
+                          NULL, NULL);
+    CHECK(tags);
+    hashtable_set (tags, "time", "2023-08-09T07:43:01.830Z");
+    hashtable_set (tags, "msgid", "icqfzy7zdbpix4gy8pvzuv49kw");
+
     POINTERS_EQUAL(NULL, server->batches);
 
-    batch = irc_batch_start_batch (server, "ref", NULL, "type", NULL);
+    batch = irc_batch_start_batch (server, "ref", NULL, "type", NULL, NULL);
     CHECK(batch);
     POINTERS_EQUAL(batch, server->batches);
     STRCMP_EQUAL("ref", batch->reference);
     POINTERS_EQUAL(NULL, batch->parent_ref);
     STRCMP_EQUAL("type", batch->type);
     POINTERS_EQUAL(NULL, batch->parameters);
+    POINTERS_EQUAL(NULL, batch->tags);
     CHECK(batch->start_time > 0);
     POINTERS_EQUAL(NULL, batch->messages);
     LONGS_EQUAL(0, batch->end_received);
@@ -126,13 +147,19 @@ TEST(IrcBatch, StartBatch)
 
     POINTERS_EQUAL(NULL, server->batches);
 
-    batch = irc_batch_start_batch (server, "ref", "parent_ref", "type", "params");
+    batch = irc_batch_start_batch (server, "ref", "parent_ref", "type", "params",
+                                   tags);
     CHECK(batch);
     POINTERS_EQUAL(batch, server->batches);
     STRCMP_EQUAL("ref", batch->reference);
     STRCMP_EQUAL("parent_ref", batch->parent_ref);
     STRCMP_EQUAL("type", batch->type);
     STRCMP_EQUAL("params", batch->parameters);
+    CHECK(batch->tags);
+    STRCMP_EQUAL("2023-08-09T07:43:01.830Z",
+                 (const char *)hashtable_get (batch->tags, "time"));
+    STRCMP_EQUAL("icqfzy7zdbpix4gy8pvzuv49kw",
+                 (const char *)hashtable_get (batch->tags, "msgid"));
     CHECK(batch->start_time > 0);
     POINTERS_EQUAL(NULL, batch->messages);
 
@@ -159,7 +186,8 @@ TEST(IrcBatch, AddMessage)
     server = irc_server_alloc ("server");
     CHECK(server);
 
-    batch = irc_batch_start_batch (server, "ref", "parent_ref", "type", "params");
+    batch = irc_batch_start_batch (server, "ref", "parent_ref", "type", "params",
+                                   NULL);
     CHECK(batch);
 
     irc_batch_add_message (server, "ref", ":alice PRIVMSG #test: test1");
@@ -187,10 +215,12 @@ TEST(IrcBatch, FreeAll)
     server = irc_server_alloc ("server");
     CHECK(server);
 
-    batch1 = irc_batch_start_batch (server, "ref1", "parent_ref", "type", "params");
+    batch1 = irc_batch_start_batch (server, "ref1", "parent_ref", "type", "params",
+                                    NULL);
     CHECK(batch1);
 
-    batch2 = irc_batch_start_batch (server, "ref2", "parent_ref", "type", "params");
+    batch2 = irc_batch_start_batch (server, "ref2", "parent_ref", "type", "params",
+                                    NULL);
     CHECK(batch2);
 
     POINTERS_EQUAL(batch1, server->batches);

tests/unit/plugins/irc/test-irc-join.cpp

@@ -117,7 +117,7 @@ TEST_GROUP(IrcJoin)
  *   irc_join_compare_join_channel
  */
 
-TEST(IrcJoin, CompateJoinChannel)
+TEST(IrcJoin, CompareJoinChannel)
 {
     struct t_irc_join_channel join_chan1, join_chan2;
 
@@ -129,24 +129,24 @@ TEST(IrcJoin, CompateJoinChannel)
     LONGS_EQUAL(0, irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2));
 
     join_chan1.name = strdup ("#abc");
-    LONGS_EQUAL(35, irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2));
+    CHECK(irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2) > 0);
 
     join_chan2.name = strdup ("#abc");
     LONGS_EQUAL(0, irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2));
 
     join_chan1.key = strdup ("key_abc");
-    LONGS_EQUAL(-1, irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2));
+    CHECK(irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2) < 0);
 
     join_chan2.key = strdup ("key_abc");
     LONGS_EQUAL(0, irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2));
 
     free (join_chan2.key);
     join_chan2.key = strdup ("key2_abc");
-    LONGS_EQUAL(45, irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2));
+    CHECK(irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2) > 0);
 
     free (join_chan2.name);
     join_chan2.name = strdup ("#def");
-    LONGS_EQUAL(-3, irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2));
+    CHECK(irc_join_compare_join_channel (NULL, &join_chan1, &join_chan2) < 0);
 
     free (join_chan1.name);
     free (join_chan1.key);